mirror of
https://github.com/Bluewhale1337/ElvUIModernized.git
synced 2026-07-27 16:34:45 +00:00
load ColorPicker module
@Bunny67 I cannot get it to load Skins module. Can you take a look?
This commit is contained in:
Crum
@@ -1190,7 +1190,7 @@ function L_UIDropDownMenu_GetValue(id)
|
||||
end
|
||||
end
|
||||
|
||||
--[[function OpenColorPicker(info) --ColorPicker stuff not changed
|
||||
function OpenColorPicker(info) --ColorPicker stuff not changed
|
||||
ColorPickerFrame.func = info.swatchFunc;
|
||||
ColorPickerFrame.hasOpacity = info.hasOpacity;
|
||||
ColorPickerFrame.opacityFunc = info.opacityFunc;
|
||||
@@ -1205,4 +1205,4 @@ end
|
||||
|
||||
function ColorPicker_GetPreviousValues()
|
||||
return ColorPickerFrame.previousValues.r, ColorPickerFrame.previousValues.g, ColorPickerFrame.previousValues.b;
|
||||
end]]
|
||||
end
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
local E, L, V, P, G = unpack(ElvUI)
|
||||
local B = E:NewModule("Blizzard", "AceEvent-3.0", "AceHook-3.0")
|
||||
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
|
||||
local B = E:NewModule("Blizzard", "AceEvent-3.0", "AceHook-3.0");
|
||||
|
||||
local GetNumQuestChoices = GetNumQuestChoices
|
||||
local GetNumQuestLogChoices = GetNumQuestLogChoices
|
||||
@@ -14,7 +14,7 @@ E.Blizzard = B
|
||||
|
||||
function B:Initialize()
|
||||
-- self:AlertMovers()
|
||||
-- self:EnhanceColorPicker()
|
||||
self:EnhanceColorPicker()
|
||||
-- self:KillBlizzard()
|
||||
-- self:PositionCaptureBar()
|
||||
-- self:PositionDurabilityFrame()
|
||||
|
||||
@@ -0,0 +1,296 @@
|
||||
--[[
|
||||
Credit to Jaslm, most of this code is his from the addon ColorPickerPlus
|
||||
]]
|
||||
local E, L, DF = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
|
||||
local B = E:GetModule("Blizzard", true);
|
||||
local S = E:GetModule("Skins", true);
|
||||
|
||||
local tonumber, collectgarbage = tonumber, collectgarbage
|
||||
local floor = math.floor
|
||||
local format, strsub = string.format, strsub
|
||||
|
||||
local CreateFrame = CreateFrame
|
||||
local RAID_CLASS_COLORS = RAID_CLASS_COLORS
|
||||
local CUSTOM_CLASS_COLORS = CUSTOM_CLASS_COLORS
|
||||
local CLASS, DEFAULTS = CLASS, DEFAULTS
|
||||
|
||||
local colorBuffer = {}
|
||||
local editingText
|
||||
|
||||
local RAID_CLASS_COLORS = RAID_CLASS_COLORS
|
||||
local CUSTOM_CLASS_COLORS = CUSTOM_CLASS_COLORS
|
||||
|
||||
local function UpdateAlphaText()
|
||||
local a = OpacitySliderFrame:GetValue()
|
||||
a = (1 - a) * 100
|
||||
a = floor(a +.05)
|
||||
ColorPPBoxA:SetText(format("%d", a))
|
||||
end
|
||||
|
||||
local function UpdateColorTexts(r, g, b)
|
||||
if not r then r, g, b = ColorPickerFrame:GetColorRGB() end
|
||||
r = r*255
|
||||
g = g*255
|
||||
b = b*255
|
||||
ColorPPBoxR:SetText(format("%d", r))
|
||||
ColorPPBoxG:SetText(format("%d", g))
|
||||
ColorPPBoxB:SetText(format("%d", b))
|
||||
ColorPPBoxH:SetText(format("%.2x%.2x%.2x", r, g, b))
|
||||
end
|
||||
|
||||
function B:EnhanceColorPicker()
|
||||
if IsAddOnLoaded("ColorPickerPlus") then return end
|
||||
ColorPickerFrame:SetClampedToScreen(true)
|
||||
|
||||
--Skin the default frame, move default buttons into place
|
||||
E:SetTemplate(ColorPickerFrame, "Transparent")
|
||||
ColorPickerFrameHeader:SetTexture("")
|
||||
ColorPickerFrameHeader:ClearAllPoints()
|
||||
ColorPickerFrameHeader:SetPoint("TOP", ColorPickerFrame, 0, 0)
|
||||
-- S:HandleButton(ColorPickerOkayButton)
|
||||
-- S:HandleButton(ColorPickerCancelButton)
|
||||
ColorPickerCancelButton:ClearAllPoints()
|
||||
ColorPickerOkayButton:ClearAllPoints()
|
||||
ColorPickerCancelButton:SetPoint("BOTTOMRIGHT", ColorPickerFrame, "BOTTOMRIGHT", -6, 6)
|
||||
ColorPickerCancelButton:SetPoint("BOTTOMLEFT", ColorPickerFrame, "BOTTOM", 0, 6)
|
||||
ColorPickerOkayButton:SetPoint("BOTTOMLEFT", ColorPickerFrame,"BOTTOMLEFT", 6,6)
|
||||
ColorPickerOkayButton:SetPoint("RIGHT", ColorPickerCancelButton,"LEFT", -4,0)
|
||||
-- S:HandleSliderFrame(OpacitySliderFrame)
|
||||
HookScript(ColorPickerFrame, "OnShow", function()
|
||||
-- get color that will be replaced
|
||||
local r, g, b = ColorPickerFrame:GetColorRGB()
|
||||
ColorPPOldColorSwatch:SetTexture(r, g, b)
|
||||
|
||||
-- show/hide the alpha box
|
||||
if ColorPickerFrame.hasOpacity then
|
||||
ColorPPBoxA:Show()
|
||||
ColorPPBoxLabelA:Show()
|
||||
ColorPPBoxH:SetScript("OnTabPressed", function() ColorPPBoxA:SetFocus() end)
|
||||
UpdateAlphaText()
|
||||
this:SetWidth(405)
|
||||
else
|
||||
ColorPPBoxA:Hide()
|
||||
ColorPPBoxLabelA:Hide()
|
||||
ColorPPBoxH:SetScript("OnTabPressed", function() ColorPPBoxR:SetFocus() end)
|
||||
this:SetWidth(345)
|
||||
end
|
||||
end)
|
||||
|
||||
--Memory Fix, Colorpicker will call the self.func() 100x per second, causing fps/memory issues,
|
||||
--this little script will make you have to press ok for you to notice any changes.
|
||||
ColorPickerFrame:SetScript("OnColorSelect", function(_, r, g, b)
|
||||
ColorSwatch:SetTexture(r, g, b)
|
||||
if not editingText then
|
||||
UpdateColorTexts(r, g, b)
|
||||
end
|
||||
end)
|
||||
|
||||
HookScript(ColorPickerOkayButton, "OnClick", function()
|
||||
collectgarbage() --Couldn't hurt to do this, this button usually executes a lot of code.
|
||||
end)
|
||||
|
||||
HookScript(OpacitySliderFrame, "OnValueChanged", function()
|
||||
if not editingText then
|
||||
UpdateAlphaText()
|
||||
end
|
||||
end)
|
||||
|
||||
-- make the Color Picker dialog a bit taller, to make room for edit boxes
|
||||
ColorPickerFrame:SetHeight(ColorPickerFrame:GetHeight() + 40)
|
||||
|
||||
-- move the Color Swatch
|
||||
ColorSwatch:ClearAllPoints()
|
||||
ColorSwatch:SetPoint("TOPLEFT", ColorPickerFrame, "TOPLEFT", 215, -45)
|
||||
|
||||
-- add Color Swatch for original color
|
||||
local t = ColorPickerFrame:CreateTexture("ColorPPOldColorSwatch")
|
||||
local w, h = ColorSwatch:GetWidth(), ColorSwatch:GetHeight()
|
||||
t:SetWidth(w*0.75)
|
||||
t:SetHeight(h*0.75)
|
||||
t:SetTexture(0,0,0)
|
||||
-- OldColorSwatch to appear beneath ColorSwatch
|
||||
t:SetDrawLayer("BORDER")
|
||||
t:SetPoint("BOTTOMLEFT", "ColorSwatch", "TOPRIGHT", -(w/2), -(h/3))
|
||||
|
||||
-- add Color Swatch for the copied color
|
||||
t = ColorPickerFrame:CreateTexture("ColorPPCopyColorSwatch")
|
||||
t:SetWidth(w)
|
||||
t:SetHeight(h)
|
||||
t:SetTexture(0,0,0)
|
||||
t:Hide()
|
||||
|
||||
-- add copy button to the ColorPickerFrame
|
||||
local b = CreateFrame("Button", "ColorPPCopy", ColorPickerFrame, "UIPanelButtonTemplate")
|
||||
-- S:HandleButton(b)
|
||||
b:SetText(L["Copy"])
|
||||
b:SetWidth(60)
|
||||
b:SetHeight(22)
|
||||
b:SetPoint("TOPLEFT", "ColorSwatch", "BOTTOMLEFT", 0, -5)
|
||||
|
||||
-- copy color into buffer on button click
|
||||
b:SetScript("OnClick", function()
|
||||
-- copy current dialog colors into buffer
|
||||
colorBuffer.r, colorBuffer.g, colorBuffer.b = ColorPickerFrame:GetColorRGB()
|
||||
|
||||
-- enable Paste button and display copied color into swatch
|
||||
ColorPPPaste:Enable()
|
||||
ColorPPCopyColorSwatch:SetTexture(colorBuffer.r, colorBuffer.g, colorBuffer.b)
|
||||
ColorPPCopyColorSwatch:Show()
|
||||
|
||||
if ColorPickerFrame.hasOpacity then
|
||||
colorBuffer.a = OpacitySliderFrame:GetValue()
|
||||
else
|
||||
colorBuffer.a = nil
|
||||
end
|
||||
end)
|
||||
|
||||
--class color button
|
||||
b = CreateFrame("Button", "ColorPPClass", ColorPickerFrame, "UIPanelButtonTemplate")
|
||||
b:SetText(CLASS)
|
||||
-- S:HandleButton(b)
|
||||
b:SetWidth(80)
|
||||
b:SetHeight(22)
|
||||
b:SetPoint("TOP", "ColorPPCopy", "BOTTOMRIGHT", 0, -7)
|
||||
|
||||
b:SetScript("OnClick", function()
|
||||
local color = E.myclass == "PRIEST" and E.PriestColors or (CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[E.myclass] or RAID_CLASS_COLORS[E.myclass])
|
||||
ColorPickerFrame:SetColorRGB(color.r, color.g, color.b)
|
||||
ColorSwatch:SetTexture(color.r, color.g, color.b)
|
||||
if ColorPickerFrame.hasOpacity then
|
||||
OpacitySliderFrame:SetValue(0)
|
||||
end
|
||||
end)
|
||||
|
||||
-- add paste button to the ColorPickerFrame
|
||||
b = CreateFrame("Button", "ColorPPPaste", ColorPickerFrame, "UIPanelButtonTemplate")
|
||||
b:SetText(L["Paste"])
|
||||
-- S:HandleButton(b)
|
||||
b:SetWidth(60)
|
||||
b:SetHeight(22)
|
||||
b:SetPoint("TOPLEFT", "ColorPPCopy", "TOPRIGHT", 2, 0)
|
||||
b:Disable() -- enable when something has been copied
|
||||
|
||||
-- paste color on button click, updating frame components
|
||||
b:SetScript("OnClick", function()
|
||||
ColorPickerFrame:SetColorRGB(colorBuffer.r, colorBuffer.g, colorBuffer.b)
|
||||
ColorSwatch:SetTexture(colorBuffer.r, colorBuffer.g, colorBuffer.b)
|
||||
if ColorPickerFrame.hasOpacity then
|
||||
if colorBuffer.a then --color copied had an alpha value
|
||||
OpacitySliderFrame:SetValue(colorBuffer.a)
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
-- add defaults button to the ColorPickerFrame
|
||||
b = CreateFrame("Button", "ColorPPDefault", ColorPickerFrame, "UIPanelButtonTemplate")
|
||||
b:SetText(DEFAULTS)
|
||||
-- S:HandleButton(b)
|
||||
b:SetWidth(80)
|
||||
b:SetHeight(22)
|
||||
b:SetPoint("TOPLEFT", "ColorPPClass", "BOTTOMLEFT", 0, -7)
|
||||
b:Disable() -- enable when something has been copied
|
||||
b:SetScript("OnHide", function()
|
||||
this.colors = nil
|
||||
end)
|
||||
b:SetScript("OnShow", function()
|
||||
if this.colors then
|
||||
this:Enable()
|
||||
else
|
||||
this:Disable()
|
||||
end
|
||||
end)
|
||||
|
||||
-- paste color on button click, updating frame components
|
||||
b:SetScript("OnClick", function()
|
||||
local colorBuffer = this.colors
|
||||
ColorPickerFrame:SetColorRGB(colorBuffer.r, colorBuffer.g, colorBuffer.b)
|
||||
ColorSwatch:SetTexture(colorBuffer.r, colorBuffer.g, colorBuffer.b)
|
||||
if ColorPickerFrame.hasOpacity then
|
||||
if colorBuffer.a then
|
||||
OpacitySliderFrame:SetValue(colorBuffer.a)
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
-- position Color Swatch for copy color
|
||||
ColorPPCopyColorSwatch:SetPoint("BOTTOM", "ColorPPPaste", "TOP", 0, 10)
|
||||
|
||||
-- move the Opacity Slider Frame to align with bottom of Copy ColorSwatch
|
||||
OpacitySliderFrame:ClearAllPoints()
|
||||
OpacitySliderFrame:SetPoint("BOTTOM", "ColorPPDefault", "BOTTOM", 0, 0)
|
||||
OpacitySliderFrame:SetPoint("RIGHT", "ColorPickerFrame", "RIGHT", -35, 18)
|
||||
|
||||
-- set up edit box frames and interior label and text areas
|
||||
local boxes = { "R", "G", "B", "H", "A" }
|
||||
for i = 1, getn(boxes) do
|
||||
|
||||
local rgb = boxes[i]
|
||||
local box = CreateFrame("EditBox", "ColorPPBox"..rgb, ColorPickerFrame, "InputBoxTemplate")
|
||||
-- S:HandleEditBox(box)
|
||||
box:SetID(i)
|
||||
box:SetFrameStrata("DIALOG")
|
||||
box:SetAutoFocus(false)
|
||||
box:SetTextInsets(0,7,0,0)
|
||||
box:SetJustifyH("RIGHT")
|
||||
box:SetHeight(24)
|
||||
|
||||
if i == 4 then
|
||||
-- Hex entry box
|
||||
box:SetMaxLetters(6)
|
||||
box:SetWidth(56)
|
||||
box:SetNumeric(false)
|
||||
else
|
||||
box:SetMaxLetters(3)
|
||||
box:SetWidth(40)
|
||||
box:SetNumeric(true)
|
||||
end
|
||||
box:SetPoint("TOP", "ColorPickerWheel", "BOTTOM", 0, -15)
|
||||
|
||||
-- label
|
||||
local label = box:CreateFontString("ColorPPBoxLabel"..rgb, "ARTWORK", "GameFontNormalSmall")
|
||||
label:SetTextColor(1, 1, 1)
|
||||
label:SetPoint("RIGHT", "ColorPPBox"..rgb, "LEFT", -5, 0)
|
||||
if i == 4 then
|
||||
label:SetText("#")
|
||||
else
|
||||
label:SetText(rgb)
|
||||
end
|
||||
|
||||
-- set up scripts to handle event appropriately
|
||||
if i == 5 then
|
||||
box:SetScript("OnEscapePressed", function() this:ClearFocus() UpdateAlphaText() end)
|
||||
box:SetScript("OnEnterPressed", function() this:ClearFocus() UpdateAlphaText() end)
|
||||
else
|
||||
box:SetScript("OnEscapePressed", function() this:ClearFocus() UpdateColorTexts() end)
|
||||
box:SetScript("OnEnterPressed", function() this:ClearFocus() UpdateColorTexts() end)
|
||||
end
|
||||
|
||||
box:SetScript("OnEditFocusGained", function() this:SetCursorPosition(0) this:HighlightText() end)
|
||||
box:SetScript("OnEditFocusLost", function() this:HighlightText(0,0) end)
|
||||
box:SetScript("OnTextSet", function() this:ClearFocus() end)
|
||||
box:Show()
|
||||
end
|
||||
|
||||
-- finish up with placement
|
||||
ColorPPBoxA:SetPoint("RIGHT", "OpacitySliderFrame", "RIGHT", 10, 0)
|
||||
ColorPPBoxH:SetPoint("RIGHT", "ColorPPDefault", "RIGHT", -10, 0)
|
||||
ColorPPBoxB:SetPoint("RIGHT", "ColorPPDefault", "LEFT", -40, 0)
|
||||
ColorPPBoxG:SetPoint("RIGHT", "ColorPPBoxB", "LEFT", -25, 0)
|
||||
ColorPPBoxR:SetPoint("RIGHT", "ColorPPBoxG", "LEFT", -25, 0)
|
||||
|
||||
-- define the order of tab cursor movement
|
||||
ColorPPBoxR:SetScript("OnTabPressed", function() ColorPPBoxG:SetFocus() end)
|
||||
ColorPPBoxG:SetScript("OnTabPressed", function() ColorPPBoxB:SetFocus() end)
|
||||
ColorPPBoxB:SetScript("OnTabPressed", function() ColorPPBoxH:SetFocus() end)
|
||||
ColorPPBoxA:SetScript("OnTabPressed", function() ColorPPBoxR:SetFocus() end)
|
||||
|
||||
-- make the color picker movable.
|
||||
local mover = CreateFrame("Frame", nil, ColorPickerFrame)
|
||||
mover:SetPoint("TOPLEFT", ColorPickerFrame, "TOP", -60, 0)
|
||||
mover:SetPoint("BOTTOMRIGHT", ColorPickerFrame, "TOP", 60, -15)
|
||||
mover:EnableMouse(true)
|
||||
mover:SetScript("OnMouseDown", function() ColorPickerFrame:StartMoving() end)
|
||||
mover:SetScript("OnMouseUp", function() ColorPickerFrame:StopMovingOrSizing() end)
|
||||
ColorPickerFrame:SetUserPlaced(true)
|
||||
ColorPickerFrame:EnableKeyboard(false)
|
||||
end
|
||||
@@ -1,4 +1,5 @@
|
||||
<Ui xmlns="http://www.blizzard.com/wow/ui/">
|
||||
<Script file="Blizzard.lua"/>
|
||||
<Script file="ColorPicker.lua"/>
|
||||
<Script file="WatchFrame.lua"/>
|
||||
</Ui>
|
||||
Reference in New Issue
Block a user