Exiles/coa-details
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Tercio Jose
2022-10-15 13:11:18 -03:00
parent 3f3d4db5f0
commit 035c8d6a7f
16 changed files with 432 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/DF/button.lua
+92 -91
View File
@@ -123,169 +123,170 @@ DF:Mixin(ButtonMetaFunctions, DF.ScriptHookMixin)
ButtonMetaFunctions.GetMembers["textfont"] = gmember_textfont --alias
ButtonMetaFunctions.GetMembers["textsize"] = gmember_textsize --alias
ButtonMetaFunctions.__index = function(_table, _member_requested)
local func = ButtonMetaFunctions.GetMembers [_member_requested]
ButtonMetaFunctions.__index = function(object, key)
local func = ButtonMetaFunctions.GetMembers[key]
if (func) then
return func (_table, _member_requested)
return func(object, key)
end
local fromMe = rawget(_table, _member_requested)
if (fromMe) then
return fromMe
local alreadyHaveKey = rawget(object, key)
if (alreadyHaveKey) then
return alreadyHaveKey
end
return ButtonMetaFunctions [_member_requested]
return ButtonMetaFunctions[key]
end
-------------------------------------------------------------------------------------------------------------------------------------------------------------------
--tooltip
local smember_tooltip = function(_object, _value)
return _object:SetTooltip (_value)
local smember_tooltip = function(object, value)
return object:SetTooltip (value)
end
--show
local smember_show = function(_object, _value)
if (_value) then
return _object:Show()
local smember_show = function(object, value)
if (value) then
return object:Show()
else
return _object:Hide()
return object:Hide()
end
end
--hide
local smember_hide = function(_object, _value)
if (not _value) then
return _object:Show()
local smember_hide = function(object, value)
if (not value) then
return object:Show()
else
return _object:Hide()
return object:Hide()
end
end
--frame width
local smember_width = function(_object, _value)
return _object.button:SetWidth(_value)
local smember_width = function(object, value)
return object.button:SetWidth(value)
end
--frame height
local smember_height = function(_object, _value)
return _object.button:SetHeight(_value)
local smember_height = function(object, value)
return object.button:SetHeight(value)
end
--text
local smember_text = function(_object, _value)
return _object.button.text:SetText(_value)
local smember_text = function(object, value)
return object.button.text:SetText(value)
end
--function
local smember_function = function(_object, _value)
return rawset(_object, "func", _value)
local smember_function = function(object, value)
return rawset(object, "func", value)
end
--param1
local smember_param1 = function(_object, _value)
return rawset(_object, "param1", _value)
local smember_param1 = function(object, value)
return rawset(object, "param1", value)
end
--param2
local smember_param2 = function(_object, _value)
return rawset(_object, "param2", _value)
local smember_param2 = function(object, value)
return rawset(object, "param2", value)
end
--text color
local smember_textcolor = function(_object, _value)
local _value1, _value2, _value3, _value4 = DF:ParseColors(_value)
return _object.button.text:SetTextColor(_value1, _value2, _value3, _value4)
local smember_textcolor = function(object, value)
local value1, value2, value3, value4 = DF:ParseColors(value)
return object.button.text:SetTextColor(value1, value2, value3, value4)
end
--text font
local smember_textfont = function(_object, _value)
return DF:SetFontFace (_object.button.text, _value)
local smember_textfont = function(object, value)
return DF:SetFontFace (object.button.text, value)
end
--text size
local smember_textsize = function(_object, _value)
return DF:SetFontSize (_object.button.text, _value)
local smember_textsize = function(object, value)
return DF:SetFontSize (object.button.text, value)
end
--texture
local smember_texture = function(_object, _value)
if (type(_value) == "table") then
local _value1, _value2, _value3, _value4 = unpack(_value)
if (_value1) then
_object.button:SetNormalTexture(_value1)
local smember_texture = function(object, value)
if (type(value) == "table") then
local value1, value2, value3, value4 = unpack(value)
if (value1) then
object.button:SetNormalTexture(value1)
end
if (_value2) then
_object.button:SetHighlightTexture(_value2, "ADD")
if (value2) then
object.button:SetHighlightTexture(value2, "ADD")
end
if (_value3) then
_object.button:SetPushedTexture(_value3)
if (value3) then
object.button:SetPushedTexture(value3)
end
if (_value4) then
_object.button:SetDisabledTexture (_value4)
if (value4) then
object.button:SetDisabledTexture(value4)
end
else
_object.button:SetNormalTexture(_value)
_object.button:SetHighlightTexture(_value, "ADD")
_object.button:SetPushedTexture(_value)
_object.button:SetDisabledTexture (_value)
object.button:SetNormalTexture(value)
object.button:SetHighlightTexture(value, "ADD")
object.button:SetPushedTexture(value)
object.button:SetDisabledTexture(value)
end
return
end
--locked
local smember_locked = function(_object, _value)
if (_value) then
_object.button:SetMovable(false)
return rawset(_object, "is_locked", true)
local smember_locked = function(object, value)
if (value) then
object.button:SetMovable(false)
return rawset(object, "is_locked", true)
else
_object.button:SetMovable(true)
rawset(_object, "is_locked", false)
object.button:SetMovable(true)
rawset(object, "is_locked", false)
return
end
end
--text align
local smember_textalign = function(_object, _value)
if (_value == "left" or _value == "<") then
_object.button.text:SetPoint("left", _object.button, "left", 2, 0)
_object.capsule_textalign = "left"
elseif (_value == "center" or _value == "|") then
_object.button.text:SetPoint("center", _object.button, "center", 0, 0)
_object.capsule_textalign = "center"
elseif (_value == "right" or _value == ">") then
_object.button.text:SetPoint("right", _object.button, "right", -2, 0)
_object.capsule_textalign = "right"
local smember_textalign = function(object, value)
if (value == "left" or value == "<") then
object.button.text:SetPoint("left", object.button, "left", 2, 0)
object.capsule_textalign = "left"
elseif (value == "center" or value == "|") then
object.button.text:SetPoint("center", object.button, "center", 0, 0)
object.capsule_textalign = "center"
elseif (value == "right" or value == ">") then
object.button.text:SetPoint("right", object.button, "right", -2, 0)
object.capsule_textalign = "right"
end
end
ButtonMetaFunctions.SetMembers = ButtonMetaFunctions.SetMembers or {}
ButtonMetaFunctions.SetMembers ["tooltip"] = smember_tooltip
ButtonMetaFunctions.SetMembers ["show"] = smember_show
ButtonMetaFunctions.SetMembers ["hide"] = smember_hide
ButtonMetaFunctions.SetMembers ["width"] = smember_width
ButtonMetaFunctions.SetMembers ["height"] = smember_height
ButtonMetaFunctions.SetMembers ["text"] = smember_text
ButtonMetaFunctions.SetMembers ["clickfunction"] = smember_function
ButtonMetaFunctions.SetMembers ["param1"] = smember_param1
ButtonMetaFunctions.SetMembers ["param2"] = smember_param2
ButtonMetaFunctions.SetMembers ["textcolor"] = smember_textcolor
ButtonMetaFunctions.SetMembers ["textfont"] = smember_textfont
ButtonMetaFunctions.SetMembers ["textsize"] = smember_textsize
ButtonMetaFunctions.SetMembers ["fontcolor"] = smember_textcolor--alias
ButtonMetaFunctions.SetMembers ["fontface"] = smember_textfont--alias
ButtonMetaFunctions.SetMembers ["fontsize"] = smember_textsize--alias
ButtonMetaFunctions.SetMembers ["texture"] = smember_texture
ButtonMetaFunctions.SetMembers ["locked"] = smember_locked
ButtonMetaFunctions.SetMembers ["textalign"] = smember_textalign
ButtonMetaFunctions.SetMembers= ButtonMetaFunctions.SetMembers or {}
ButtonMetaFunctions.SetMembers["tooltip"] = smember_tooltip
ButtonMetaFunctions.SetMembers["show"] = smember_show
ButtonMetaFunctions.SetMembers["hide"] = smember_hide
ButtonMetaFunctions.SetMembers["width"] = smember_width
ButtonMetaFunctions.SetMembers["height"] = smember_height
ButtonMetaFunctions.SetMembers["text"] = smember_text
ButtonMetaFunctions.SetMembers["clickfunction"] = smember_function
ButtonMetaFunctions.SetMembers["param1"] = smember_param1
ButtonMetaFunctions.SetMembers["param2"] = smember_param2
ButtonMetaFunctions.SetMembers["textcolor"] = smember_textcolor
ButtonMetaFunctions.SetMembers["textfont"] = smember_textfont
ButtonMetaFunctions.SetMembers["textsize"] = smember_textsize
ButtonMetaFunctions.SetMembers["fontcolor"] = smember_textcolor--alias
ButtonMetaFunctions.SetMembers["fontface"] = smember_textfont--alias
ButtonMetaFunctions.SetMembers["fontsize"] = smember_textsize--alias
ButtonMetaFunctions.SetMembers["texture"] = smember_texture
ButtonMetaFunctions.SetMembers["locked"] = smember_locked
ButtonMetaFunctions.SetMembers["textalign"] = smember_textalign
ButtonMetaFunctions.__newindex = function(_table, _key, _value)
local func = ButtonMetaFunctions.SetMembers [_key]
ButtonMetaFunctions.__newindex = function(object, key, value)
local func = ButtonMetaFunctions.SetMembers[key]
if (func) then
return func (_table, _value)
return func(object, value)
else
return rawset(_table, _key, _value)
return rawset(object, key, value)
end
end
Libs/DF/cooltip.lua
+1 -1
View File
@@ -1134,7 +1134,7 @@ function DF:CreateCoolTip()
function gameCooltip:RefreshSpark(menuButton)
menuButton.spark:ClearAllPoints()
menuButton.spark:SetPoint("LEFT", menuButton.statusbar, "LEFT", (menuButton.statusbar:GetValue() * (menuButton.statusbar:GetWidth() / 100)) - 5, 0)
menuButton.spark:SetPoint("left", menuButton.statusbar, "left", (menuButton.statusbar:GetValue() * (menuButton.statusbar:GetWidth() / 100)) - 5, 0)
menuButton.spark2:ClearAllPoints()
menuButton.spark2:SetPoint("left", menuButton.statusbar, "left", menuButton.statusbar:GetValue() * (menuButton.statusbar:GetWidth()/100) - 16, 0)
end
Libs/DF/fw.lua
+6
View File
@@ -2630,6 +2630,12 @@ end
DF.ClientLanguage = clientLanguage
function DF:DetectTextLanguage(text)
for i = 1, #text do
--or not
end
end
--returns which region the language the client is running, return "western", "russia" or "asia"
function DF:GetClientRegion()
if (clientLanguage == "zhCN" or clientLanguage == "koKR" or clientLanguage == "zhTW") then
Libs/DF/slider.lua
+23 -26
View File
@@ -421,8 +421,8 @@ DF:Mixin(DFSliderMetaFunctions, DF.ScriptHookMixin)
buttonPlus:SetPushedTexture([[Interface\Buttons\UI-PlusButton-Down]])
buttonMinor:SetPushedTexture([[Interface\Buttons\UI-MinusButton-Down]])
buttonPlus:SetDisabledTexture ([[Interface\Buttons\UI-PlusButton-Disabled]])
buttonMinor:SetDisabledTexture ([[Interface\Buttons\UI-MinusButton-Disabled]])
buttonPlus:SetDisabledTexture([[Interface\Buttons\UI-PlusButton-Disabled]])
buttonMinor:SetDisabledTexture([[Interface\Buttons\UI-MinusButton-Disabled]])
buttonPlus:SetHighlightTexture([[Interface\Buttons\UI-PlusButton-Hilight]])
buttonMinor:SetHighlightTexture([[Interface\Buttons\UI-PlusButton-Hilight]])
@@ -1047,9 +1047,7 @@ function DF:CreateSlider (parent, w, h, min, max, step, defaultv, isDecemal, mem
return slider, label
end
function DF:NewSlider (parent, container, name, member, w, h, min, max, step, defaultv, isDecemal, isSwitch, with_label, slider_template, label_template)
--early checks
function DF:NewSlider (parent, container, name, member, width, height, minValue, maxValue, step, defaultValue, isDecemal, isSwitch, with_label, slider_template, label_template)
if (not name) then
name = "DetailsFrameworkSlider" .. DF.SliderCounter
DF.SliderCounter = DF.SliderCounter + 1
@@ -1080,13 +1078,13 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
end
--defaults
min = min or 1
max = max or 2
minValue = minValue or 1
maxValue = maxValue or 2
step = step or 1
defaultv = defaultv or min
defaultValue = defaultValue or minValue
w = w or 130
h = h or 19
width = width or 130
height = height or 19
--default members:
SliderObject.lockdown = false
@@ -1098,40 +1096,40 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
SliderObject.useDecimals = isDecemal or false
if (SliderObject.useDecimals) then
SliderObject.slider:SetValueStep (0.01)
SliderObject.slider:SetValueStep(0.01)
else
SliderObject.slider:SetValueStep (step)
SliderObject.slider:SetValueStep(step)
end
if (not APISliderFunctions) then
APISliderFunctions = true
local idx = getmetatable(SliderObject.slider).__index
for funcName, funcAddress in pairs(idx) do
if (not DFSliderMetaFunctions [funcName]) then
DFSliderMetaFunctions [funcName] = function(object, ...)
if (not DFSliderMetaFunctions[funcName]) then
DFSliderMetaFunctions[funcName] = function(object, ...)
local x = loadstring ( "return _G['"..object.slider:GetName().."']:"..funcName.."(...)")
return x (...)
return x(...)
end
end
end
end
SliderObject.slider.MyObject = SliderObject
SliderObject.slider:SetWidth(w)
SliderObject.slider:SetHeight(h)
SliderObject.slider:SetWidth(width)
SliderObject.slider:SetHeight(height)
SliderObject.slider:SetOrientation ("horizontal")
SliderObject.slider:SetMinMaxValues(min, max)
SliderObject.slider:SetValue(defaultv)
SliderObject.ivalue = defaultv
SliderObject.slider:SetMinMaxValues(minValue, maxValue)
SliderObject.slider:SetValue(defaultValue)
SliderObject.ivalue = defaultValue
SliderObject.slider:SetBackdrop({edgeFile = "Interface\\Buttons\\UI-SliderBar-Border", edgeSize = 8})
SliderObject.slider:SetBackdropColor(0.9, 0.7, 0.7, 1.0)
SliderObject.thumb = SliderObject.slider:CreateTexture(nil, "artwork")
SliderObject.thumb:SetTexture("Interface\\Buttons\\UI-ScrollBar-Knob")
SliderObject.thumb:SetSize(30+(h*0.2), h*1.2)
SliderObject.thumb:SetSize(30 + (height * 0.2), height * 1.2)
SliderObject.thumb.originalWidth = SliderObject.thumb:GetWidth()
SliderObject.thumb.originalHeight =SliderObject.thumb:GetHeight()
SliderObject.thumb.originalHeight = SliderObject.thumb:GetHeight()
SliderObject.thumb:SetAlpha(0.7)
SliderObject.slider:SetThumbTexture (SliderObject.thumb)
SliderObject.slider.thumb = SliderObject.thumb
@@ -1142,9 +1140,9 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
SliderObject.amt = SliderObject.slider:CreateFontString(nil, "overlay", "GameFontHighlightSmall")
local amt = defaultv
local amt = defaultValue
if (amt < 10 and amt >= 1) then
amt = "0"..amt
amt = "0" .. amt
end
if (SliderObject.useDecimals) then
@@ -1157,7 +1155,7 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
SliderObject.amt:SetPoint("center", SliderObject.thumb, "center")
SliderObject.slider.amt = SliderObject.amt
SliderObject.previous_value = {defaultv or 0, 0, 0}
SliderObject.previous_value = {defaultValue or 0, 0, 0}
--hooks
SliderObject.HookList = {
@@ -1200,7 +1198,6 @@ function DF:NewSlider (parent, container, name, member, w, h, min, max, step, de
end
return SliderObject, with_label
end
DF.AdjustmentSliderOptions = {