General fixes
This commit is contained in:
+21
-2
@@ -15,7 +15,7 @@ local max = math.max
|
||||
|
||||
--api locals
|
||||
local PixelUtil = PixelUtil or DFPixelUtil
|
||||
local version = 6
|
||||
local version = 7
|
||||
|
||||
local CONST_MENU_TYPE_MAINMENU = "main"
|
||||
local CONST_MENU_TYPE_SUBMENU = "sub"
|
||||
@@ -64,7 +64,22 @@ function DF:CreateCoolTip()
|
||||
return CONST_MENU_TYPE_MAINMENU
|
||||
end
|
||||
|
||||
local languageFontEditBox = function()
|
||||
gameCooltip.LanguageEditBox = gameCooltip.LanguageEditBox or CreateFrame("editbox")
|
||||
gameCooltip.LanguageEditBox:SetFontObject("GameFontNormal")
|
||||
gameCooltip.LanguageEditBox:ClearFocus()
|
||||
gameCooltip.LanguageEditBox:SetAutoFocus(false)
|
||||
|
||||
function gameCooltip.CheckNeedNewFont(text)
|
||||
--local file = gameCooltip.LanguageEditBox:GetFont()
|
||||
--print("1", file, text)
|
||||
--gameCooltip.LanguageEditBox:SetText("Цены аукциона")
|
||||
--local file2 = gameCooltip.LanguageEditBox:GetFont()
|
||||
--print("2", file2)
|
||||
--gameCooltip.LanguageEditBox:ClearFocus()
|
||||
|
||||
--if (file ~= file2) then
|
||||
-- gameCooltip:SetOption("TextFont", file2)
|
||||
--end
|
||||
end
|
||||
|
||||
--containers
|
||||
@@ -2738,6 +2753,8 @@ function DF:CreateCoolTip()
|
||||
end
|
||||
end
|
||||
|
||||
gameCooltip.CheckNeedNewFont(leftText)
|
||||
|
||||
local rightTextType = type(rightText)
|
||||
if (rightTextType ~= "string") then
|
||||
if (rightTextType == "number") then
|
||||
@@ -2747,6 +2764,8 @@ function DF:CreateCoolTip()
|
||||
end
|
||||
end
|
||||
|
||||
gameCooltip.CheckNeedNewFont(rightText)
|
||||
|
||||
if (type(ColorR1) ~= "number") then
|
||||
ColorR2, ColorG2, ColorB2, ColorA2, fontSize, fontFace, fontFlag = ColorG1, ColorB1, ColorA1, ColorR2, ColorG2, ColorB2, ColorA2
|
||||
if (type(ColorR1) == "boolean" or not ColorR1) then
|
||||
|
||||
Reference in New Issue
Block a user