Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 16:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

update wowAPI, ColorPicker

Browse Source
This commit is contained in:
Crum
2018-11-21 19:49:59 -06:00
parent 3325d379d0
commit a304f36f79
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
!Compatibility/api/wowAPI.lua
-3
View File
@@ -469,10 +469,7 @@ function EditBoxSetCursorPosition(self, pos)
if pos == 0 then if pos == 0 then
text = sub(text, 0, 1) text = sub(text, 0, 1)
self:HighlightText(0, 1) self:HighlightText(0, 1)
self:Insert(nbsp)
self:Insert(text) self:Insert(text)
self:HighlightText(0, 1)
self:Insert("")
else else
text = sub(text, pos, pos) text = sub(text, pos, pos)
self:HighlightText(pos - 1, pos) self:HighlightText(pos - 1, pos)
ElvUI/Modules/Blizzard/ColorPicker.lua
+16 -11
View File
@@ -5,7 +5,8 @@ local E, L, DF = unpack(ElvUI)
local B = E:GetModule("Blizzard") local B = E:GetModule("Blizzard")
local S = E:GetModule("Skins") local S = E:GetModule("Skins")
local tonumber, collectgarbage = tonumber, collectgarbage local collectgarbage = collectgarbage
local tonumber = tonumber
local floor = math.floor local floor = math.floor
local format, strsub = string.format, strsub local format, strsub = string.format, strsub
local getn = table.getn local getn = table.getn
@@ -67,7 +68,7 @@ local function UpdateColor()
-- hex values -- hex values
if this:GetNumLetters() == 6 then if this:GetNumLetters() == 6 then
local rgb = this:GetText() local rgb = this:GetText()
r, g, b = tonumber("0x"..strsub(rgb, 0, 2)), tonumber("0x"..strsub(rgb, 3, 4)), tonumber("0x"..strsub(rgb, 5, 6)) r, g, b = tonumber(strsub(rgb, 0, 2), 16), tonumber(strsub(rgb, 3, 4), 16), tonumber(strsub(rgb, 5, 6), 16)
if not r then r = 0 else r = r / 255 end if not r then r = 0 else r = r / 255 end
if not g then g = 0 else g = g / 255 end if not g then g = 0 else g = g / 255 end
if not b then b = 0 else b = b / 255 end if not b then b = 0 else b = b / 255 end
@@ -126,7 +127,7 @@ function B:EnhanceColorPicker()
HookScript(ColorPickerFrame, "OnShow", function() HookScript(ColorPickerFrame, "OnShow", function()
-- get color that will be replaced -- get color that will be replaced
local r, g, b = ColorPickerFrame:GetColorRGB() local r, g, b = ColorPickerFrame:GetColorRGB()
ColorPPOldColorSwatch:SetTexture(r,g,b) ColorPPOldColorSwatch:SetTexture(r, g, b)
-- show/hide the alpha box -- show/hide the alpha box
if ColorPickerFrame.hasOpacity then if ColorPickerFrame.hasOpacity then
@@ -146,13 +147,18 @@ function B:EnhanceColorPicker()
this:SetScript("OnUpdate", HandleUpdateLimiter) this:SetScript("OnUpdate", HandleUpdateLimiter)
end) end)
hooksecurefunc(ColorPickerFrame, "SetFrameLevel", function(self, level)
for _, child in ipairs({self:GetChildren()}) do
child:SetFrameLevel(level + 1)
end
end)
--Memory Fix, Colorpicker will call the this.func() 100x per second, causing fps/memory issues, --Memory Fix, Colorpicker will call the this.func() 100x per second, causing fps/memory issues,
--We overwrite the OnColorSelect script and set a limit on how often we allow a call to this.func --We overwrite the OnColorSelect script and set a limit on how often we allow a call to this.func
ColorPickerFrame:SetScript("OnColorSelect", function() ColorPickerFrame:SetScript("OnColorSelect", function()
local r, g, b = arg1, arg2, arg3 ColorSwatch:SetTexture(arg1, arg2, arg3)
ColorSwatch:SetTexture(r, g, b)
if not editingText then if not editingText then
UpdateColorTexts(r, g, b) UpdateColorTexts(arg1, arg2, arg3)
end end
if this.allowUpdate then if this.allowUpdate then
this.func() this.func()
@@ -266,7 +272,6 @@ function B:EnhanceColorPicker()
this.colors = nil this.colors = nil
end) end)
b:SetScript("OnShow", function() b:SetScript("OnShow", function()
print(this.colors)
if this.colors then if this.colors then
this:Enable() this:Enable()
else else
@@ -304,7 +309,7 @@ function B:EnhanceColorPicker()
box:SetID(i) box:SetID(i)
box:SetFrameStrata("DIALOG") box:SetFrameStrata("DIALOG")
box:SetAutoFocus(false) box:SetAutoFocus(false)
box:SetTextInsets(0, 14, 0, 0) box:SetTextInsets(0, 17, 0, 0)
box:SetJustifyH("RIGHT") box:SetJustifyH("RIGHT")
E:Height(box, 24) E:Height(box, 24)
@@ -332,13 +337,13 @@ function B:EnhanceColorPicker()
-- set up scripts to handle event appropriately -- set up scripts to handle event appropriately
if i == 5 then if i == 5 then
box:SetScript("OnEscapePressed", function() this:ClearFocus() UpdateAlphaText() end) box:SetScript("OnEscapePressed", function() this:ClearFocus() UpdateAlphaText() end)
box:SetScript("OnEnterPressed", function() this:ClearFocus() UpdateAlphaText() end) box:SetScript("OnEnterPressed", function() this:ClearFocus() UpdateAlphaText() end)
box:SetScript("OnTextChanged", UpdateAlpha) box:SetScript("OnTextChanged", UpdateAlpha)
else else
box:SetScript("OnEscapePressed", function() this:ClearFocus() UpdateColorTexts() end) box:SetScript("OnEscapePressed", function() this:ClearFocus() UpdateColorTexts() end)
box:SetScript("OnEnterPressed", function() this:ClearFocus() UpdateColorTexts() end) box:SetScript("OnEnterPressed", function() this:ClearFocus() UpdateColorTexts() end)
-- box:SetScript("OnTextChanged", UpdateColor) -- TODO box:SetScript("OnTextChanged", UpdateColor)
end end
box:SetScript("OnEditFocusGained", function() EditBoxSetCursorPosition(this, 0) this:HighlightText() end) box:SetScript("OnEditFocusGained", function() EditBoxSetCursorPosition(this, 0) this:HighlightText() end)