From e7e52c647c9097d5af315688713edacd8e5ecabb Mon Sep 17 00:00:00 2001 From: Crum Date: Sat, 12 Jan 2019 15:41:43 -0600 Subject: [PATCH] update --- ElvUI/Modules/Skins/Addons/Ace3.lua | 28 ++++-- ElvUI/Modules/Skins/Blizzard/Friends.lua | 105 ++++++++++++----------- ElvUI/Settings/Private.lua | 28 +++--- ElvUI_Config/General.lua | 4 +- 4 files changed, 97 insertions(+), 68 deletions(-) diff --git a/ElvUI/Modules/Skins/Addons/Ace3.lua b/ElvUI/Modules/Skins/Addons/Ace3.lua index 2dd2f96..d001751 100644 --- a/ElvUI/Modules/Skins/Addons/Ace3.lua +++ b/ElvUI/Modules/Skins/Addons/Ace3.lua @@ -124,12 +124,28 @@ function S:SkinAce3() checkbg:SetTexture("") checkbg.SetTexture = E.noop - check:SetTexture([[Interface\AddOns\ElvUI\media\textures\melli]]) - check.SetTexture = E.noop - check:SetVertexColor(1, 0.82, 0, 0.8) - E:SetInside(check, checkbg.backdrop) check:SetParent(checkbg.backdrop) + if E.private.skins.checkBoxSkin then + E:SetInside(checkbg.backdrop, checkbg, 5, 5) + + check:SetTexture([[Interface\AddOns\ElvUI\media\textures\melli]]) + check.SetTexture = E.noop + E:SetInside(check, checkbg.backdrop) + + hooksecurefunc(check, "SetDesaturated", function(chk, value) + if value == true then + chk:SetVertexColor(0.6, 0.6, 0.6, 0.8) + else + chk:SetVertexColor(1, 0.82, 0, 0.8) + end + end) + else + E:SetInside(checkbg.backdrop, checkbg, 4, 4) + + E:SetOutside(check, checkbg.backdrop, 3, 3) + end + highlight:SetTexture("") highlight.SetTexture = E.noop elseif TYPE == "Dropdown" then @@ -310,6 +326,8 @@ function S:SkinAce3() frame.checkers:SetParent(frame.backdrop) E:SetInside(frame.checkers, frame.backdrop) end + elseif TYPE == "Icon" then + E:StripTextures(widget.frame) end return oldRegisterAsWidget(self, widget) @@ -385,7 +403,7 @@ function S:SkinAce3() E:StripTextures(tab) tab.backdrop = CreateFrame("Frame", nil, tab) E:SetTemplate(tab.backdrop, "Transparent") - E:Delay(0.01, function() tab.backdrop:SetFrameLevel(tab:GetFrameLevel() - 1) end) -- Temp Fix + E:Delay(0.05, function() tab.backdrop:SetFrameLevel(tab:GetFrameLevel() - 1) end) -- Temp Fix E:Point(tab.backdrop, "TOPLEFT", 10, -3) E:Point(tab.backdrop, "BOTTOMRIGHT", -10, 0) diff --git a/ElvUI/Modules/Skins/Blizzard/Friends.lua b/ElvUI/Modules/Skins/Blizzard/Friends.lua index 9d58980..3c983d9 100644 --- a/ElvUI/Modules/Skins/Blizzard/Friends.lua +++ b/ElvUI/Modules/Skins/Blizzard/Friends.lua @@ -6,9 +6,11 @@ local S = E:GetModule("Skins"); local _G = _G local unpack = unpack --WoW API / Variables +local hooksecurefunc = hooksecurefunc local GetWhoInfo = GetWhoInfo local GetGuildRosterInfo = GetGuildRosterInfo local GUILDMEMBERS_TO_DISPLAY = GUILDMEMBERS_TO_DISPLAY +local RAID_CLASS_COLORS = RAID_CLASS_COLORS local localizedTable = {} for k, v in pairs(LOCALIZED_CLASS_NAMES_MALE) do @@ -67,14 +69,14 @@ local function LoadSkin() -- Ignore List Frame for i = 1, 2 do - local tab = _G["IgnoreFrameToggleTab"..i] - E:StripTextures(tab) - E:CreateBackdrop(tab, "Default", true) - E:Point(tab.backdrop, "TOPLEFT", 3, -7) - E:Point(tab.backdrop, "BOTTOMRIGHT", -2, -1) + local Tab = _G["IgnoreFrameToggleTab"..i] + E:StripTextures(Tab) + E:CreateBackdrop(Tab, "Default", true) + E:Point(Tab.backdrop, "TOPLEFT", 3, -7) + E:Point(Tab.backdrop, "BOTTOMRIGHT", -2, -1) - tab:SetScript("OnEnter", S.SetModifiedBackdrop) - tab:SetScript("OnLeave", S.SetOriginalBackdrop) + Tab:SetScript("OnEnter", S.SetModifiedBackdrop) + Tab:SetScript("OnLeave", S.SetOriginalBackdrop) end S:HandleButton(FriendsFrameIgnorePlayerButton) @@ -150,23 +152,27 @@ local function LoadSkin() hooksecurefunc("WhoList_Update", function() local whoOffset = FauxScrollFrame_GetOffset(WhoListScrollFrame) + local button, nameText, levelText, classText, variableText + local _, guild, level, race, class, zone, classFileName + local classTextColor, levelTextColor + local index, columnTable + local playerZone = GetRealZoneText() local playerGuild = GetGuildInfo("player") - local playerRace = UnitRace("player") for i = 1, WHOS_TO_DISPLAY, 1 do - local index = whoOffset + i - local button = _G["WhoFrameButton"..i] - local nameText = _G["WhoFrameButton"..i.."Name"] - local levelText = _G["WhoFrameButton"..i.."Level"] - local classText = _G["WhoFrameButton"..i.."Class"] - local variableText = _G["WhoFrameButton"..i.."Variable"] + index = whoOffset + i + button = _G["WhoFrameButton"..i] + nameText = _G["WhoFrameButton"..i.."Name"] + levelText = _G["WhoFrameButton"..i.."Level"] + classText = _G["WhoFrameButton"..i.."Class"] + variableText = _G["WhoFrameButton"..i.."Variable"] - local _, guild, level, race, class, zone = GetWhoInfo(index) + _, guild, level, race, class, zone = GetWhoInfo(index) - local classFileName = localizedTable[class] - local classTextColor = CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[classFileName] or RAID_CLASS_COLORS[classFileName] - local levelTextColor = GetQuestDifficultyColor(level) + classFileName = localizedTable[class] + classTextColor = CUSTOM_CLASS_COLORS and CUSTOM_CLASS_COLORS[classFileName] or RAID_CLASS_COLORS[classFileName] + levelTextColor = GetQuestDifficultyColor(level) if classFileName then button.icon:Show() @@ -175,17 +181,11 @@ local function LoadSkin() nameText:SetTextColor(classTextColor.r, classTextColor.g, classTextColor.b) levelText:SetTextColor(levelTextColor.r, levelTextColor.g, levelTextColor.b) - if zone == playerZone then - zone = "|cff00ff00"..zone - end - if guild == playerGuild then - guild = "|cff00ff00"..guild - end - if race == playerRace then - race = "|cff00ff00"..race - end + if zone == playerZone then zone = "|cff00ff00"..zone end + if guild == playerGuild then guild = "|cff00ff00"..guild end + if race == E.myrace then race = "|cff00ff00"..race end - local columnTable = {zone, guild, race} + columnTable = {zone, guild, race} variableText:SetText(columnTable[UIDropDownMenu_GetSelectedID(WhoFrameDropDown)]) else @@ -259,15 +259,16 @@ local function LoadSkin() buttonText = _G["GuildFrameButton"..i.."Level"] buttonText:SetTextColor(levelTextColor.r, levelTextColor.g, levelTextColor.b) buttonText = _G["GuildFrameButton"..i.."Zone"] + if zone == playerZone then buttonText:SetTextColor(0, 1, 0) end end + button.icon:SetTexCoord(unpack(CLASS_ICON_TCOORDS[classFileName])) end end else - local class, classFileName for i = 1, GUILDMEMBERS_TO_DISPLAY, 1 do button = _G["GuildFrameGuildStatusButton"..i] _, _, _, _, class, _, _, _, online = GetGuildRosterInfo(button.guildIndex) @@ -348,7 +349,6 @@ local function LoadSkin() E:CreateBackdrop(GuildInfoFrame, "Transparent") E:Point(GuildInfoFrame.backdrop, "TOPLEFT", 3, -6) E:Point(GuildInfoFrame.backdrop, "BOTTOMRIGHT", -2, 3) - E:Point(GuildInfoFrame, "TOPLEFT", GuildControlPopupFrame, "TOPLEFT", 2, 0) E:SetTemplate(GuildInfoTextBackground, "Default") S:HandleScrollBar(GuildInfoFrameScrollFrameScrollBar) @@ -356,7 +356,7 @@ local function LoadSkin() S:HandleCloseButton(GuildInfoCloseButton) S:HandleButton(GuildInfoSaveButton) - E:Point(GuildInfoSaveButton, "BOTTOMLEFT", 104, 11) + E:Point(GuildInfoSaveButton, "BOTTOMLEFT", 8, 11) S:HandleButton(GuildInfoCancelButton) E:Point(GuildInfoCancelButton, "LEFT", GuildInfoSaveButton, "RIGHT", 3, 0) @@ -364,29 +364,33 @@ local function LoadSkin() -- Control Frame E:StripTextures(GuildControlPopupFrame) E:CreateBackdrop(GuildControlPopupFrame, "Transparent") - E:Point(GuildControlPopupFrame.backdrop, "TOPLEFT", 3, -6) - E:Point(GuildControlPopupFrame.backdrop, "BOTTOMRIGHT", -27, 27) + E:Point(GuildControlPopupFrame.backdrop, "TOPLEFT", 3, 0) S:HandleDropDownBox(GuildControlPopupFrameDropDown, 185) - E:Size(GuildControlPopupFrameDropDownButton, 16) + E:Size(GuildControlPopupFrameDropDownButton, 18) - local function SkinPlusMinus(f, minus) - f:SetNormalTexture("") - f.SetNormalTexture = E.noop - f:SetPushedTexture("") - f.SetPushedTexture = E.noop - f:SetHighlightTexture("") - f.SetHighlightTexture = E.noop - f:SetDisabledTexture("") - f.SetDisabledTexture = E.noop + local function SkinPlusMinus(button, minus) + button:SetNormalTexture("Interface\\AddOns\\ElvUI\\media\\textures\\PlusMinusButton") + button.SetNormalTexture = E.noop + + button:SetPushedTexture("Interface\\AddOns\\ElvUI\\media\\textures\\PlusMinusButton") + button.SetPushedTexture = E.noop + + button:SetHighlightTexture("") + button.SetHighlightTexture = E.noop + + button:SetDisabledTexture("Interface\\AddOns\\ElvUI\\media\\textures\\PlusMinusButton") + button.SetDisabledTexture = E.noop + button:GetDisabledTexture():SetDesaturated(true) - f.Text = f:CreateFontString(nil, "OVERLAY") - E:FontTemplate(f.Text, nil, 22) - E:Point(f.Text, "LEFT", 5, 0) if minus then - f.Text:SetText("-") + button:GetNormalTexture():SetTexCoord(0.540, 0.965, 0.085, 0.920) + button:GetPushedTexture():SetTexCoord(0.540, 0.965, 0.085, 0.920) + button:GetDisabledTexture():SetTexCoord(0.540, 0.965, 0.085, 0.920) else - f.Text:SetText("+") + button:GetNormalTexture():SetTexCoord(0.040, 0.465, 0.085, 0.920) + button:GetPushedTexture():SetTexCoord(0.040, 0.465, 0.085, 0.920) + button:GetDisabledTexture():SetTexCoord(0.040, 0.465, 0.085, 0.920) end end @@ -394,6 +398,11 @@ local function LoadSkin() E:Point(GuildControlPopupFrameAddRankButton, "LEFT", GuildControlPopupFrameDropDown, "RIGHT", -8, 3) SkinPlusMinus(GuildControlPopupFrameRemoveRankButton, true) + E:Point(GuildControlPopupFrameRemoveRankButton, "LEFT", GuildControlPopupFrameAddRankButton, "RIGHT", 4, 0) + + + local left, right = select(6, GuildControlPopupFrameEditBox:GetRegions()) + E:Kill(left) E:Kill(right) S:HandleEditBox(GuildControlPopupFrameEditBox) E:Point(GuildControlPopupFrameEditBox.backdrop, "TOPLEFT", 0, -5) diff --git a/ElvUI/Settings/Private.lua b/ElvUI/Settings/Private.lua index 77bb6e0..c8bbc4c 100644 --- a/ElvUI/Settings/Private.lua +++ b/ElvUI/Settings/Private.lua @@ -8,7 +8,7 @@ V["general"] = { ["lootUnderMouse"] = false, ["normTex"] = "ElvUI Norm", ["glossTex"] = "ElvUI Norm", - ["dmgfont"] = "PT Sans Narrow", + ["dmgfont"] = "Homespun", ["namefont"] = "PT Sans Narrow", ["chatBubbles"] = "backdrop", ["chatBubbleFont"] = "PT Sans Narrow", @@ -20,15 +20,15 @@ V["general"] = { ["minimap"] = { ["enable"] = true, ["hideCalendar"] = true, - ["zoomLevel"] = 0, + ["zoomLevel"] = 0 }, ["classCache"] = true, - ["classColorMentionsSpeech"] = true, + ["classColorMentionsSpeech"] = true } V["bags"] = { ["enable"] = true, - ["bagBar"] = false, + ["bagBar"] = false } V["nameplates"] = { @@ -41,17 +41,18 @@ V["auras"] = { ["lbf"] = { enable = false, skin = "Blizzard" - }, + } } V["chat"] = { - ["enable"] = true, + ["enable"] = true } V["skins"] = { ["ace3"] = { ["enable"] = true, }, + ["checkBoxSkin"] = true, ["blizzard"] = { ["enable"] = true, ["alertframes"] = true, @@ -60,6 +61,7 @@ V["skins"] = { ["battlefield"] = true, ["bgscore"] = true, ["binding"] = true, + ["BlizzardOptions"] = true, ["character"] = true, ["debug"] = true, ["dressingroom"] = true, @@ -77,7 +79,7 @@ V["skins"] = { ["misc"] = true, ["petition"] = true, ["quest"] = true, - ["questtimers"] = true, + ["questtimer"] = true, ["raid"] = true, ["spellbook"] = true, ["stable"] = true, @@ -92,11 +94,11 @@ V["skins"] = { ["watchframe"] = true, ["worldmap"] = true, ["mirrorTimers"] = true - }, + } } V["tooltip"] = { - ["enable"] = true + ["enable"] = true, } V["unitframe"] = { @@ -104,8 +106,8 @@ V["unitframe"] = { ["disabledBlizzardFrames"] = { ["player"] = true, ["target"] = true, - ["party"] = true, - }, + ["party"] = true + } } V["actionbar"] = { @@ -113,9 +115,9 @@ V["actionbar"] = { ["lbf"] = { enable = false, skin = "Blizzard" - }, + } } V["cooldown"] = { enable = true -} \ No newline at end of file +} diff --git a/ElvUI_Config/General.lua b/ElvUI_Config/General.lua index 1ed3387..7574d54 100644 --- a/ElvUI_Config/General.lua +++ b/ElvUI_Config/General.lua @@ -1,5 +1,5 @@ -local E, L, V, P, G = unpack(ElvUI) --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local CC = E:GetModule("ClassCache") +local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local CC = E:GetModule("ClassCache"); --Cache global variables --Lua functions