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

update

Browse Source
This commit is contained in:
Crum
2018-11-19 22:36:22 -06:00
parent 7db8cb887a
commit 7d622f3a34
5 changed files with 92 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Modules/Skins/Addons/Ace3.lua
+86 -67
View File
@@ -42,20 +42,48 @@ local function SkinButton(f, strip, noTemplate)
end end
local function SkinDropdownPullout(self) local function SkinDropdownPullout(self)
if self.obj.pullout.frame.template and self.obj.pullout.slider.template then return end if self and self.obj then
local pullout = self.obj.pullout
local dropdown = self.obj.dropdown
if not self.obj.pullout.frame.template then if pullout and pullout.frame then
E:SetTemplate(self.obj.pullout.frame, "Default", true) if pullout.frame.template and pullout.slider.template then return end
end
if not self.obj.pullout.slider.template then if not pullout.frame.template then
E:SetTemplate(self.obj.pullout.slider, "Default") E:SetTemplate(pullout.frame, "Default", true)
E:Point(self.obj.pullout.slider, "TOPRIGHT", self.obj.pullout.frame, "TOPRIGHT", -10, -10) end
E:Point(self.obj.pullout.slider, "BOTTOMRIGHT", self.obj.pullout.frame, "BOTTOMRIGHT", -10, 10)
if self.obj.pullout.slider:GetThumbTexture() then if not pullout.slider.template then
self.obj.pullout.slider:SetThumbTexture(E.media.normTex) E:SetTemplate(pullout.slider, "Default")
self.obj.pullout.slider:GetThumbTexture():SetVertexColor(unpack(E.media.rgbvaluecolor)) E:Point(pullout.slider, "TOPRIGHT", pullout.frame, "TOPRIGHT", -10, -10)
E:Size(self.obj.pullout.slider:GetThumbTexture(), 10, 14) E:Point(pullout.slider, "BOTTOMRIGHT", pullout.frame, "BOTTOMRIGHT", -10, 10)
if pullout.slider:GetThumbTexture() then
pullout.slider:SetThumbTexture(E.media.normTex)
pullout.slider:GetThumbTexture():SetVertexColor(unpack(E.media.rgbvaluecolor))
E:Size(pullout.slider:GetThumbTexture(), 10, 14)
end
end
elseif dropdown then
E:SetTemplate(dropdown, "Default", true)
if dropdown.slider then
E:SetTemplate(dropdown.slider, "Default")
E:Point(dropdown.slider, "TOPRIGHT", dropdown, "TOPRIGHT", -10, -10)
E:Point(dropdown.slider, "BOTTOMRIGHT", dropdown, "BOTTOMRIGHT", -10, 10)
if dropdown.slider:GetThumbTexture() then
dropdown.slider:SetThumbTexture(E.media.normTex)
dropdown.slider:GetThumbTexture():SetVertexColor(unpack(E.media.rgbvaluecolor))
E:Size(dropdown.slider:GetThumbTexture(), 10, 14)
end
end
if TYPE == "LSM30_Sound" then
local frame = self.obj.frame
local width = frame:GetWidth()
E:Point(dropdown, "TOPLEFT", frame, "BOTTOMLEFT")
E:Point(dropdown, "TOPRIGHT", frame, "BOTTOMRIGHT", width < 160 and (160 - width) or 30, 0)
end
end end
end end
end end
@@ -81,6 +109,7 @@ function S:SkinAce3()
SkinButton(widget.button) SkinButton(widget.button)
S:HandleScrollBar(widget.scrollBar) S:HandleScrollBar(widget.scrollBar)
E:Point(widget.scrollBar, "RIGHT", frame, "RIGHT", 0 -4) E:Point(widget.scrollBar, "RIGHT", frame, "RIGHT", 0 -4)
E:Point(scrollBG, "TOPRIGHT", widget.scrollBar, "TOPLEFT", -2, 19) E:Point(scrollBG, "TOPRIGHT", widget.scrollBar, "TOPLEFT", -2, 19)
E:Point(scrollBG, "BOTTOMLEFT", widget.button, "TOPLEFT") E:Point(scrollBG, "BOTTOMLEFT", widget.button, "TOPLEFT")
E:Point(widget.scrollFrame, "BOTTOMRIGHT", scrollBG, "BOTTOMRIGHT", -4, 8) E:Point(widget.scrollFrame, "BOTTOMRIGHT", scrollBG, "BOTTOMRIGHT", -4, 8)
@@ -117,7 +146,7 @@ function S:SkinAce3()
E:CreateBackdrop(frame, "Default") E:CreateBackdrop(frame, "Default")
end end
E:Point(frame.backdrop, "TOPLEFT", 15, -2) E:Point(frame.backdrop, "TOPLEFT", 17, -2)
E:Point(frame.backdrop, "BOTTOMRIGHT", -21, 0) E:Point(frame.backdrop, "BOTTOMRIGHT", -21, 0)
widget.label:ClearAllPoints() widget.label:ClearAllPoints()
@@ -128,6 +157,9 @@ function S:SkinAce3()
E:Point(button, "RIGHT", frame.backdrop, "RIGHT", -2, 0) E:Point(button, "RIGHT", frame.backdrop, "RIGHT", -2, 0)
button:SetParent(frame.backdrop) button:SetParent(frame.backdrop)
text:ClearAllPoints()
E:Point(text, "RIGHT", frame.backdrop, "RIGHT", -26, 2)
E:Point(text, "LEFT", frame.backdrop, "LEFT", 2, 0)
text:SetParent(frame.backdrop) text:SetParent(frame.backdrop)
HookScript(button, "OnClick", SkinDropdownPullout) HookScript(button, "OnClick", SkinDropdownPullout)
@@ -176,30 +208,7 @@ function S:SkinAce3()
button:SetParent(frame.backdrop) button:SetParent(frame.backdrop)
text:SetParent(frame.backdrop) text:SetParent(frame.backdrop)
HookScript(button, "OnClick", function(self) HookScript(button, "OnClick", SkinDropdownPullout)
local dropdown = self.obj.dropdown
if dropdown then
E:SetTemplate(dropdown, "Default", true)
if dropdown.slider then
E:SetTemplate(dropdown.slider, "Transparent")
E:Point(dropdown.slider, "TOPRIGHT", dropdown, "TOPRIGHT", -10, -10)
E:Point(dropdown.slider, "BOTTOMRIGHT", dropdown, "BOTTOMRIGHT", -10, 10)
if dropdown.slider:GetThumbTexture() then
dropdown.slider:SetThumbTexture(E.media.normTex)
dropdown.slider:GetThumbTexture():SetVertexColor(unpack(E.media.rgbvaluecolor))
E:Size(dropdown.slider:GetThumbTexture(), 10, 14)
end
end
if TYPE == "LSM30_Sound" then
local frame = self.obj.frame
local width = frame:GetWidth()
E:Point(dropdown, "TOPLEFT", frame, "BOTTOMLEFT")
E:Point(dropdown, "TOPRIGHT", frame, "BOTTOMRIGHT", width < 160 and (160 - width) or 30, 0)
end
end
end)
elseif TYPE == "EditBox" then elseif TYPE == "EditBox" then
local frame = widget.editbox local frame = widget.editbox
local button = widget.button local button = widget.button
@@ -235,23 +244,6 @@ function S:SkinAce3()
E:SetInside(frame.backdrop) E:SetInside(frame.backdrop)
widget.text:SetParent(frame.backdrop) widget.text:SetParent(frame.backdrop)
elseif TYPE == "Keybinding" then
local button = widget.button
local msgframe = widget.msgframe
local msg = widget.msgframe.msg
SkinButton(button)
E:StripTextures(msgframe)
E:CreateBackdrop(msgframe, "Default", true)
E:SetInside(msgframe.backdrop)
msgframe:SetToplevel(true)
msg:ClearAllPoints()
E:Point(msg, "LEFT", 10, 0)
E:Point(msg, "RIGHT", -10, 0)
msg:SetJustifyV("MIDDLE")
E:Width(msg, msg:GetWidth() + 10)
elseif TYPE == "Slider" then elseif TYPE == "Slider" then
local frame = widget.slider local frame = widget.slider
local editbox = widget.editbox local editbox = widget.editbox
@@ -273,6 +265,23 @@ function S:SkinAce3()
E:Point(lowtext, "TOPLEFT", frame, "BOTTOMLEFT", 2, -2) E:Point(lowtext, "TOPLEFT", frame, "BOTTOMLEFT", 2, -2)
E:Point(hightext, "TOPRIGHT", frame, "BOTTOMRIGHT", -2, -2) E:Point(hightext, "TOPRIGHT", frame, "BOTTOMRIGHT", -2, -2)
elseif TYPE == "Keybinding" then
local button = widget.button
local msgframe = widget.msgframe
local msg = widget.msgframe.msg
SkinButton(button)
E:StripTextures(msgframe)
E:CreateBackdrop(msgframe, "Default", true)
E:SetInside(msgframe.backdrop)
msgframe:SetToplevel(true)
msg:ClearAllPoints()
E:Point(msg, "LEFT", 10, 0)
E:Point(msg, "RIGHT", -10, 0)
msg:SetJustifyV("MIDDLE")
E:Width(msg, msg:GetWidth() + 10)
elseif (TYPE == "ColorPicker" or TYPE == "ColorPicker-ElvUI") then elseif (TYPE == "ColorPicker" or TYPE == "ColorPicker-ElvUI") then
local frame = widget.frame local frame = widget.frame
local colorSwatch = widget.colorSwatch local colorSwatch = widget.colorSwatch
@@ -286,6 +295,8 @@ function S:SkinAce3()
E:Point(frame.backdrop, "LEFT", frame, "LEFT", 4, 0) E:Point(frame.backdrop, "LEFT", frame, "LEFT", 4, 0)
frame.backdrop:SetBackdropColor(0, 0, 0, 0) frame.backdrop:SetBackdropColor(0, 0, 0, 0)
frame.backdrop.SetBackdropColor = E.noop frame.backdrop.SetBackdropColor = E.noop
frame.backdrop:SetBackdropBorderColor(1, 1, 1)
frame.backdrop.SetBackdropBorderColor = E.noop
colorSwatch:SetTexture(E.media.blankTex) colorSwatch:SetTexture(E.media.blankTex)
colorSwatch:ClearAllPoints() colorSwatch:ClearAllPoints()
@@ -370,20 +381,28 @@ function S:SkinAce3()
end end
end end
if TYPE == "TabGroup" then if TYPE == "TabGroup" then
local oldCreateTab = widget.CreateTab local oldCreateTab = widget.CreateTab
widget.CreateTab = function(self, id) widget.CreateTab = function(self, id)
local tab = oldCreateTab(self, id) local tab = oldCreateTab(self, id)
E:StripTextures(tab) E:StripTextures(tab)
--[[tab.backdrop = CreateFrame("Frame", nil, tab) tab.backdrop = CreateFrame("Frame", nil, tab)
E:SetTemplate(tab.backdrop, "Transparent") E:SetTemplate(tab.backdrop, "Transparent")
tab.backdrop:SetFrameLevel(tab:GetFrameLevel() - 1) E:Point(tab.backdrop, "TOPLEFT", 10, -3)
E:Point(tab.backdrop, "TOPLEFT", 10, -3) E:Point(tab.backdrop, "BOTTOMRIGHT", -10, 0)
E:Point(tab.backdrop, "BOTTOMRIGHT", -10, 0)--]]
return tab HookScript(tab, "OnShow", function(self)
end local tabFrame = tab:GetFrameLevel()
end local tabBackdrop = tab.backdrop:GetFrameLevel()
if tabFrame <= tabBackdrop then
tab.backdrop:SetFrameLevel(tabFrame - 1)
end
end)
return tab
end
end
if widget.scrollbar then if widget.scrollbar then
S:HandleScrollBar(widget.scrollbar) S:HandleScrollBar(widget.scrollbar)
ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
+1 -1
View File
@@ -74,7 +74,7 @@ Constructor
-------------------------------------------------------------------------------]] -------------------------------------------------------------------------------]]
local function Constructor() local function Constructor()
local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type) local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2") local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate")
frame:Hide() frame:Hide()
frame:EnableMouse(true) frame:EnableMouse(true)
ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
+1 -1
View File
@@ -722,7 +722,7 @@ do
self.text = text self.text = text
text.obj = self text.obj = self
text:ClearAllPoints() text:ClearAllPoints()
text:SetPoint("RIGHT", right, "RIGHT" ,-46, 2) text:SetPoint("RIGHT", right, "RIGHT" ,-43, 2)
text:SetPoint("LEFT", left, "LEFT", 25, 2) text:SetPoint("LEFT", left, "LEFT", 25, 2)
local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall") local label = frame:CreateFontString(nil,"OVERLAY","GameFontNormalSmall")
ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
+1 -1
View File
@@ -192,7 +192,7 @@ local function Constructor()
local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type) local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type)
local frame = CreateFrame("Frame", nil, UIParent) local frame = CreateFrame("Frame", nil, UIParent)
local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate2") local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate")
button:EnableMouse(true) button:EnableMouse(true)
button:EnableMouseWheel(false) button:EnableMouseWheel(false)
ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
+2
View File
@@ -139,6 +139,7 @@ local methods = {
self.disabled = disabled self.disabled = disabled
if disabled then if disabled then
self.slider:EnableMouse(false) self.slider:EnableMouse(false)
self.slider:GetThumbTexture():SetDesaturated(true) -- ElvUI
self.label:SetTextColor(.5, .5, .5) self.label:SetTextColor(.5, .5, .5)
self.hightext:SetTextColor(.5, .5, .5) self.hightext:SetTextColor(.5, .5, .5)
self.lowtext:SetTextColor(.5, .5, .5) self.lowtext:SetTextColor(.5, .5, .5)
@@ -148,6 +149,7 @@ local methods = {
self.editbox:ClearFocus() self.editbox:ClearFocus()
else else
self.slider:EnableMouse(true) self.slider:EnableMouse(true)
self.slider:GetThumbTexture():SetDesaturated(false) -- ElvUI
self.label:SetTextColor(1, .82, 0) self.label:SetTextColor(1, .82, 0)
self.hightext:SetTextColor(1, 1, 1) self.hightext:SetTextColor(1, 1, 1)
self.lowtext:SetTextColor(1, 1, 1) self.lowtext:SetTextColor(1, 1, 1)