Commit b60e98b5 authored by Simpy's avatar Simpy 🐹

Merge branch 'development' into ptr

parents 0482ce8b c50a0ead
### Version 12.01 [ ETA: 🍨 ]
### Version 12.06 [ ETA: 🍨 ]
**Shiny:**
**Changes:**
___
### Version 12.05 [ October 21st 2020 ]
**Changes:**
Attempted to fix a taint with opening Spellbook in combat
Shut off the NewPlayerExperience because it conflicts with ActionBars
Small update for Missions and Follower skins (classhall)
ClassBar when login as kitty was tiny
___
### Version 12.04 [ October 19th 2020 ]
**Nice:**
Boss button should appear as its supposed to now.
Gender display option in tooltip had space on the wrong side.
Adjusted the QuestXP code to not mess with Reward Item Tooltip.
Fixed Additional Power Prediction not anchoring properly when set to vertical fill.
Cleaned up the Equipment flyout skin some.
Movie frame dialog backdrop was missing.
___
### Version 12.03 [ October 17th 2020 ]
**Yay:**
Fixed taint for Override Action Button Show
Battleground Datatext was showing in Arena where it doesn't work anymore
Objective Tracker button has a range overlay now and the (its grey) should be fixed
Stance bar showing when entering a Battleground on priest and it switching you to healer from Shadow
Databar Quest XP will show green for quests you are on and have completed, unless you have completed enabled
Heal Pred was anchoring incorrectly when absorb style was set to None
Fixed Alternative Power UnitIsUnit error
___
### Version 12.02 [ October 17th 2020 ]
**Fancy:**
Clean Boss Button option wasn't saving properly.
Added a Show Bubbles option for Databars.
Fixed Difficulty Datatext error.
Added two buttons to Quick Toggle Blizzard Skins, in the skin section of config.
Allowed the MicroBar to be shown in Pet Battles by editing the visibility setting.
___
### Version 12.01 [ October 16th 2020 ]
**Nice:**
Unitframe and Nameplate font issues (new method to get them showing properly)
Actionbar Backdrops we reworked to fix them being a little funky, this includes Pet and Stance bar
Boss and Zone Button being jumpy
**Good:**
oUF updates
System DT options: No Label, Other Addons
ElvUI_QuestXP is now depreciated and forced off
**Fixed:**
Voice Chat Error
NewComer Chat Error
Reagent Bank busted
Status Report Errors
Tooltips breaking other things
Ace3 skin breaking other things
Buffwatch errors (they are Aurawatch now)
Databars not showing properly with combat setting
Databars Show Border option not working properly
Unitframe Additional power works again
Unitframe Heal and Power Prediction
Nameplate Power Bars were weird
Nameplate failing to update
Test Nameplate works a lot better now
Time Datatext showing empty world PVP stuff
**Unbroken Skins:**
Pet Battle Tooltip
Scrap Machine
Azerite Respec
AutoComplete backdrop
Bag Bar icons being wrong
Bank Skin with Bag module off
Equipment Flyout was busted
___
### Version 12.00 [ October 13th 2020 ]
**Cool:**
**Cool:**
We updated our backdrop code to behave nicely with the backdrop changes Blizzard implemented.
We decided to completely rewrite the DataBars, this includes rewriting the old threat into this new module.
......@@ -59,31 +145,31 @@ Bags Datatext is a little less weird now.
Added Text Justify setting, so text can hug left/right if you want.
New datatext for Date, incase you aren't sure.
**Config:**
**Config:**
Style Filters and Custom Texts will be automatically selected when created now.
Options Logo was animating a little too much, someone gave it too much candy.
Copy From should update the config to match now.
Skin options are again sorted in order.
**UnitFrames:**
**UnitFrames:**
Buff Indicator better supports Blizzard Cooldowns when our Cooldown module is disabled.
Added some new Absorb settings (aka one is old but readded now).
Party Pets and Party Targets can now display Aura Highlight.
Added Interrupted Color for castbar on Unitframes.
**NamePlates:**
**NamePlates:**
Castbar Time should fit better.
Fixed Player Nameplate being weird half of the time.
Quest Icons also shows the quest ! texture now in some cases, and wont show 1 on the icon anymore.
Quest Icons code was slightly updated to improve locales and pick the correct icon to use, so now it might work on other languages better.
Corrected a Style Filter error, also let entering and leaving combat trigger filters correctly (regardless of unit threat).
**Chat:**
**Chat:**
Panel Movers will update with the Panel resizing again.
Docked chats werent fading correctly.
Added option to hide the Copy Button.
**ActionBars:**
**ActionBars:**
Equipped Item border wasn't updating correctly.
Extra Action Button cooldown was not showing when it should.
......@@ -96,7 +182,7 @@ Added option to show Class Icon as Portrait.
Style filter settings were getting stuck in last version.
Corrected a few issues with Portrait backdrops being shown when they weren't supposed to.
**Options:**
**Options:**
Masque options are now clickable again.
___
......
......@@ -418,7 +418,7 @@ function E:UpdateBorderColors()
local r, g, b = unpack(E.media.bordercolor)
for frame in pairs(E.frames) do
if frame and frame.template and not frame:IsForbidden() then
if not (frame.ignoreUpdates or frame.ignoreBorderColors) and (frame.template == 'Default' or frame.template == 'Transparent') then
if not (frame.ignoreUpdates or frame.forcedBorderColors) and (frame.template == 'Default' or frame.template == 'Transparent') then
frame:SetBackdropBorderColor(r, g, b)
end
else
......@@ -429,7 +429,7 @@ function E:UpdateBorderColors()
local r2, g2, b2 = unpack(E.media.unitframeBorderColor)
for frame in pairs(E.unitFrameElements) do
if frame and frame.template and not frame:IsForbidden() then
if not (frame.ignoreUpdates or frame.ignoreBorderColors) and (frame.template == 'Default' or frame.template == 'Transparent') then
if not (frame.ignoreUpdates or frame.forcedBorderColors) and (frame.template == 'Default' or frame.template == 'Transparent') then
frame:SetBackdropBorderColor(r2, g2, b2)
end
else
......
......@@ -280,7 +280,7 @@ local blacklistedKeys = {
},
unitframe = {
aurafilters = true,
buffwatch = true,
aurawatch = true,
effectiveHealth = true,
effectivePower = true,
effectiveAura = true,
......@@ -318,7 +318,7 @@ D.GeneratedKeys = {
},
unitframe = {
aurafilters = true,
buffwatch = true
aurawatch = true
},
nameplate = {
filters = true
......@@ -365,8 +365,8 @@ local function GetProfileData(profileType)
profileData.unitframe = {}
profileData.unitframe.aurafilters = {}
profileData.unitframe.aurafilters = E:CopyTable(profileData.unitframe.aurafilters, ElvDB.global.unitframe.aurafilters)
profileData.unitframe.buffwatch = {}
profileData.unitframe.buffwatch = E:CopyTable(profileData.unitframe.buffwatch, ElvDB.global.unitframe.buffwatch)
profileData.unitframe.aurawatch = {}
profileData.unitframe.aurawatch = E:CopyTable(profileData.unitframe.aurawatch, ElvDB.global.unitframe.aurawatch)
profileData = E:RemoveTableDuplicates(profileData, G, D.GeneratedKeys.global)
profileKey = 'filters'
elseif profileType == 'styleFilters' then
......
......@@ -2,15 +2,30 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
local LSM = E.Libs.LSM
local _G = _G
local min, max = min, max
local strmatch = strmatch
local function SetFont(obj, font, size, style, sr, sg, sb, sa, sox, soy, r, g, b)
if not obj then return end
obj:SetFont(font, size, style)
if sr and sg and sb then obj:SetShadowColor(sr, sg, sb, sa) end
if sox and soy then obj:SetShadowOffset(sox, soy) end
if r and g and b then obj:SetTextColor(r, g, b)
elseif r then obj:SetAlpha(r) end
if sr and sg and sb then
obj:SetShadowColor(sr, sg, sb, sa)
end
if sox and soy then
obj:SetShadowOffset(sox, soy)
end
if r and g and b then
obj:SetTextColor(r, g, b)
elseif r then
obj:SetAlpha(r)
end
end
local function GetSize(size)
return max(11, min(42, size))
end
local chatFontHeights = {6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}
......@@ -21,9 +36,8 @@ function E:UpdateBlizzardFonts()
local NAMEFONT = LSM:Fetch('font', E.private.general.namefont)
local BUBBLE = LSM:Fetch('font', E.private.general.chatBubbleFont)
local MONOCHROME = strmatch(E.db.general.fontStyle, 'MONOCHROME') and 'MONOCHROME' or ''
_G.CHAT_FONT_HEIGHTS = chatFontHeights
if E.eyefinity then COMBAT = E.Media.Fonts.Invisible end -- set an invisible font for xp, honor kill, etc
if E.private.general.replaceNameFont then _G.UNIT_NAME_FONT = NAMEFONT end
if E.private.general.replaceCombatFont then _G.DAMAGE_TEXT_FONT = COMBAT end
......@@ -31,22 +45,38 @@ function E:UpdateBlizzardFonts()
_G.STANDARD_TEXT_FONT = NORMAL
--_G.NAMEPLATE_FONT = NAMEFONT
SetFont(_G.AchievementFont_Small, NORMAL, E.db.general.fontSize) -- Achiev dates
SetFont(_G.BossEmoteNormalHuge, NORMAL, 24) -- Talent Title
SetFont(_G.ChatBubbleFont, BUBBLE, E.private.general.chatBubbleFontSize, E.private.general.chatBubbleFontOutline)
SetFont(_G.CoreAbilityFont, NORMAL, 26) -- Core abilities(title)
local size = E.db.general.fontSize
local enormous = GetSize(size * 2.00)
local mega = GetSize(size * 1.75)
local huge = GetSize(size * 1.50)
local large = GetSize(size * 1.25)
local medium = GetSize(size * 1.15)
local small = GetSize(size * 0.95)
local tiny = GetSize(size * 0.90)
local mono = strmatch(E.db.general.fontStyle, 'MONOCHROME') and 'MONOCHROME' or ''
local thick = mono..'THICKOUTLINE'
local outline = mono..'OUTLINE'
SetFont(_G.AchievementFont_Small, NORMAL, small) -- 10 -- Achiev dates
SetFont(_G.BossEmoteNormalHuge, NORMAL, 25) -- Talent Title
SetFont(_G.ChatBubbleFont, BUBBLE, E.private.general.chatBubbleFontSize, E.private.general.chatBubbleFontOutline) -- 13
SetFont(_G.CoreAbilityFont, NORMAL, 30) -- 32 -- Core abilities(title)
SetFont(_G.DestinyFontHuge, NORMAL, 32) -- Garrison Mission Report
SetFont(_G.DestinyFontMed, NORMAL, 14) -- Added in 7.3.5 used for ?
SetFont(_G.Fancy12Font, NORMAL, 12) -- Added in 7.3.5 used for ?
SetFont(_G.Fancy14Font, NORMAL, 14) -- Added in 7.3.5 used for ?
SetFont(_G.Fancy22Font, NORMAL, 20) -- Talking frame Title font
SetFont(_G.Fancy24Font, NORMAL, 20) -- Artifact frame - weapon name
SetFont(_G.FriendsFont_Large, NORMAL, E.db.general.fontSize)
SetFont(_G.FriendsFont_Normal, NORMAL, E.db.general.fontSize)
SetFont(_G.FriendsFont_Small, NORMAL, E.db.general.fontSize)
SetFont(_G.FriendsFont_UserText, NORMAL, E.db.general.fontSize)
SetFont(_G.Fancy22Font, NORMAL, 22) -- Talking frame Title font
SetFont(_G.Fancy24Font, NORMAL, 24) -- Artifact frame - weapon name
SetFont(_G.FriendsFont_11, NORMAL, 11)
SetFont(_G.FriendsFont_Large, NORMAL, large) -- 14
SetFont(_G.FriendsFont_Normal, NORMAL, size) -- 12
SetFont(_G.FriendsFont_UserText, NORMAL, size) -- 11
SetFont(_G.FriendsFont_Small, NORMAL, small) -- 10
SetFont(_G.Game10Font_o1, NORMAL, 10, 'OUTLINE')
SetFont(_G.Game120Font, NORMAL, 120)
SetFont(_G.Game12Font, NORMAL, 12) -- PVP Stuff
SetFont(_G.Game13FontShadow, NORMAL, 14) -- InspectPvpFrame
SetFont(_G.Game13FontShadow, NORMAL, 13) -- InspectPvpFrame
SetFont(_G.Game15Font_o1, NORMAL, 15) -- CharacterStatsPane (ItemLevelFrame)
SetFont(_G.Game16Font, NORMAL, 16) -- Added in 7.3.5 used for ?
SetFont(_G.Game18Font, NORMAL, 18) -- MissionUI Bonus Chance
......@@ -59,71 +89,23 @@ function E:UpdateBlizzardFonts()
SetFont(_G.Game48FontShadow, NORMAL, 48)
SetFont(_G.Game60Font, NORMAL, 60)
SetFont(_G.Game72Font, NORMAL, 72)
SetFont(_G.Game120Font, NORMAL, 120)
SetFont(_G.GameFont_Gigantic, NORMAL, 32) -- Used at the install steps
SetFont(_G.GameFontHighlightMedium, NORMAL, 15) -- Fix QuestLog Title mouseover
SetFont(_G.GameFontHighlightSmall2, NORMAL, E.db.general.fontSize) -- Skill or Recipe description on TradeSkill frame
SetFont(_G.GameFontNormalHuge2, NORMAL, 24) -- Mythic weekly best dungeon name
SetFont(_G.GameFontNormalLarge, NORMAL, 16)
SetFont(_G.GameFontNormalLarge2, NORMAL, 15) -- Garrison Follower Names
SetFont(_G.GameFontNormalMed1, NORMAL, 14) -- WoW Token Info
SetFont(_G.GameFontNormalMed2, NORMAL, E.db.general.fontSize*1.1) -- Quest tracker
SetFont(_G.GameFontNormalMed3, NORMAL, 15)
SetFont(_G.GameFontNormalSmall2, NORMAL, 12) -- MissionUI Followers names
SetFont(_G.GameTooltipHeader, NORMAL, E.db.general.fontSize)
SetFont(_G.InvoiceFont_Med, NORMAL, 12) -- Mail
SetFont(_G.InvoiceFont_Small, NORMAL, E.db.general.fontSize) -- Mail
SetFont(_G.GameFontHighlightMedium, NORMAL, medium) -- 14 -- Fix QuestLog Title mouseover
SetFont(_G.GameFontHighlightSmall2, NORMAL, small) -- 11 -- Skill or Recipe description on TradeSkill frame
SetFont(_G.GameFontNormalHuge2, NORMAL, huge) -- 24 -- Mythic weekly best dungeon name
SetFont(_G.GameFontNormalLarge, NORMAL, large) -- 16
SetFont(_G.GameFontNormalLarge2, NORMAL, large) -- 18 -- Garrison Follower Names
SetFont(_G.GameFontNormalMed1, NORMAL, size) -- 13 -- WoW Token Info
SetFont(_G.GameFontNormalMed2, NORMAL, size) -- 14 -- Quest tracker
SetFont(_G.GameFontNormalMed3, NORMAL, size) -- 14
SetFont(_G.GameFontNormalSmall2, NORMAL, small) -- 11 -- MissionUI Followers names
SetFont(_G.GameTooltipHeader, NORMAL, size) -- 14
SetFont(_G.InvoiceFont_Med, NORMAL, size) -- 12 -- Mail
SetFont(_G.InvoiceFont_Small, NORMAL, small) -- 10 -- Mail
SetFont(_G.MailFont_Large, NORMAL, 14) -- Mail
SetFont(_G.NumberFont_Outline_Huge, NUMBER, 28, MONOCHROME..'THICKOUTLINE', 28)
SetFont(_G.NumberFont_Outline_Large, NUMBER, 15, MONOCHROME..'OUTLINE')
SetFont(_G.NumberFont_Outline_Med, NUMBER, E.db.general.fontSize*1.1, 'OUTLINE')
SetFont(_G.NumberFont_OutlineThick_Mono_Small, NUMBER, E.db.general.fontSize, 'OUTLINE')
SetFont(_G.NumberFont_Shadow_Med, NORMAL, E.db.general.fontSize) -- Chat EditBox
SetFont(_G.NumberFont_Shadow_Small, NORMAL, E.db.general.fontSize)
SetFont(_G.NumberFontNormalSmall, NORMAL, 11, 'OUTLINE') -- Calendar, EncounterJournal
SetFont(_G.Number11Font, NORMAL, 11)
SetFont(_G.Number12Font, NORMAL, 12)
SetFont(_G.Number15Font, NORMAL, 15)
SetFont(_G.PriceFont, NORMAL, 13)
SetFont(_G.PVPArenaTextString, NORMAL, 22, MONOCHROME..'OUTLINE')
SetFont(_G.PVPInfoTextString, NORMAL, 22, MONOCHROME..'OUTLINE')
SetFont(_G.QuestFont, NORMAL, E.db.general.fontSize)
SetFont(_G.QuestFont_Enormous, NORMAL, 24) -- Garrison Titles
SetFont(_G.QuestFont_Huge, NORMAL, 15) -- Quest rewards title(Rewards)
SetFont(_G.QuestFont_Large, NORMAL, 14)
SetFont(_G.QuestFont_Shadow_Huge, NORMAL, 15) -- Quest Title
SetFont(_G.QuestFont_Shadow_Small, NORMAL, 14)
SetFont(_G.QuestFont_Super_Huge, NORMAL, 22)
SetFont(_G.ReputationDetailFont, NORMAL, E.db.general.fontSize) -- Rep Desc when clicking a rep
SetFont(_G.SubZoneTextFont, NORMAL, 24, MONOCHROME..'OUTLINE') -- World Map(SubZone)
SetFont(_G.SubZoneTextString, NORMAL, 25, MONOCHROME..'OUTLINE')
SetFont(_G.SystemFont_Huge1, NORMAL, 20) -- Garrison Mission XP
SetFont(_G.SystemFont_Huge1_Outline, NORMAL, 18, MONOCHROME..'OUTLINE') -- Garrison Mission Chance
SetFont(_G.SystemFont_Large, NORMAL, 15)
SetFont(_G.SystemFont_Med1, NORMAL, E.db.general.fontSize)
SetFont(_G.SystemFont_Med3, NORMAL, E.db.general.fontSize*1.1)
SetFont(_G.SystemFont_Outline, NORMAL, 13, MONOCHROME..'OUTLINE') -- Pet level on World map
SetFont(_G.SystemFont_Outline_Small, NUMBER, E.db.general.fontSize, 'OUTLINE')
SetFont(_G.SystemFont_OutlineThick_Huge2, NORMAL, 20, MONOCHROME..'THICKOUTLINE')
SetFont(_G.SystemFont_OutlineThick_WTF, NORMAL, 32, MONOCHROME..'OUTLINE') -- World Map
SetFont(_G.SystemFont_Shadow_Huge1, NORMAL, 20, MONOCHROME..'OUTLINE') -- Raid Warning, Boss emote frame too
SetFont(_G.SystemFont_Shadow_Huge3, NORMAL, 22) -- FlightMap
SetFont(_G.SystemFont_Shadow_Large, NORMAL, 15)
SetFont(_G.SystemFont_Shadow_Large2, NORMAL, 18) -- Auction House ItemDisplay
SetFont(_G.SystemFont_Shadow_Large_Outline, NUMBER, 20, 'OUTLINE')
SetFont(_G.SystemFont_Shadow_Med1, NORMAL, E.db.general.fontSize)
SetFont(_G.SystemFont_Shadow_Med2, NORMAL, 13 * 1.1) -- Shows Order resourses on OrderHallTalentFrame
SetFont(_G.SystemFont_Shadow_Med3, NORMAL, 13 * 1.1)
SetFont(_G.SystemFont_Shadow_Med3, NORMAL, E.db.general.fontSize*1.1)
SetFont(_G.SystemFont_Shadow_Small, NORMAL, E.db.general.fontSize*0.9)
SetFont(_G.SystemFont_Small, NORMAL, E.db.general.fontSize)
SetFont(_G.SystemFont_Tiny, NORMAL, E.db.general.fontSize)
SetFont(_G.Tooltip_Med, NORMAL, E.db.general.fontSize)
SetFont(_G.Tooltip_Small, NORMAL, E.db.general.fontSize)
SetFont(_G.ZoneTextString, NORMAL, 32, MONOCHROME..'OUTLINE')
SetFont(_G.Game10Font_o1, NORMAL, 10, 'OUTLINE')
SetFont(_G.SystemFont_Shadow_Huge4, NORMAL, 27, nil, nil, nil, nil, nil, 1, -1)
SetFont(_G.Number11Font, NUMBER, 11)
SetFont(_G.Number12Font, NORMAL, 12)
SetFont(_G.Number12Font_o1, NUMBER, 12, 'OUTLINE')
SetFont(_G.Number13Font, NUMBER, 13)
SetFont(_G.Number13FontGray, NUMBER, 13)
......@@ -131,10 +113,54 @@ function E:UpdateBlizzardFonts()
SetFont(_G.Number13FontYellow, NUMBER, 13)
SetFont(_G.Number14FontGray, NUMBER, 14)
SetFont(_G.Number14FontWhite, NUMBER, 14)
SetFont(_G.Number15Font, NORMAL, 15)
SetFont(_G.Number18Font, NUMBER, 18)
SetFont(_G.Number18FontWhite, NUMBER, 18)
SetFont(_G.FriendsFont_11, NORMAL, 11)
SetFont(_G.NumberFont_Outline_Huge, NUMBER, huge, thick) -- 30
SetFont(_G.NumberFont_Outline_Large, NUMBER, large, outline) -- 16
SetFont(_G.NumberFont_Outline_Med, NUMBER, medium, 'OUTLINE') -- 14
SetFont(_G.NumberFont_OutlineThick_Mono_Small, NUMBER, size, 'OUTLINE') -- 12
SetFont(_G.NumberFont_Shadow_Med, NORMAL, medium) -- 14 -- Chat EditBox
SetFont(_G.NumberFont_Shadow_Small, NORMAL, small) -- 12
SetFont(_G.NumberFontNormalSmall, NORMAL, small, 'OUTLINE') -- 12 -- Calendar, EncounterJournal
SetFont(_G.PriceFont, NORMAL, 14)
SetFont(_G.PVPArenaTextString, NORMAL, 22, outline)
SetFont(_G.PVPInfoTextString, NORMAL, 22, outline)
SetFont(_G.QuestFont, NORMAL, size) -- 13
SetFont(_G.QuestFont_Enormous, NORMAL, enormous) -- 30 -- Garrison Titles
SetFont(_G.QuestFont_Huge, NORMAL, huge) -- 18 -- Quest rewards title(Rewards)
SetFont(_G.QuestFont_Large, NORMAL, large) -- 14
SetFont(_G.QuestFont_Shadow_Huge, NORMAL, huge) -- 18 -- Quest Title
SetFont(_G.QuestFont_Shadow_Small, NORMAL, small) -- 14
SetFont(_G.QuestFont_Super_Huge, NORMAL, mega) -- 24
SetFont(_G.ReputationDetailFont, NORMAL, size) -- 10 -- Rep Desc when clicking a rep
SetFont(_G.SpellFont_Small, NORMAL, 10)
SetFont(_G.SubSpellFont, NORMAL, 10) -- Spellbook Sub Names
SetFont(_G.SubZoneTextFont, NORMAL, 24, outline) -- 26 -- World Map(SubZone)
SetFont(_G.SubZoneTextString, NORMAL, 25, outline) -- 26
SetFont(_G.SystemFont_Huge1, NORMAL, 20) -- Garrison Mission XP
SetFont(_G.SystemFont_Huge1_Outline, NORMAL, 18, outline) -- 20 -- Garrison Mission Chance
SetFont(_G.SystemFont_Large, NORMAL, 16)
SetFont(_G.SystemFont_Med1, NORMAL, size) -- 12
SetFont(_G.SystemFont_Med3, NORMAL, medium) -- 14
SetFont(_G.SystemFont_Outline, NORMAL, size, outline) -- 13 -- Pet level on World map
SetFont(_G.SystemFont_Outline_Small, NUMBER, small, 'OUTLINE') -- 10
SetFont(_G.SystemFont_OutlineThick_Huge2, NORMAL, huge, thick) -- 22
SetFont(_G.SystemFont_OutlineThick_WTF, NORMAL, enormous, outline) -- 32 -- World Map
SetFont(_G.SystemFont_Shadow_Huge1, NORMAL, 20, outline) -- Raid Warning, Boss emote frame too
SetFont(_G.SystemFont_Shadow_Huge3, NORMAL, 25) -- FlightMap
SetFont(_G.SystemFont_Shadow_Huge4, NORMAL, 27, nil, nil, nil, nil, nil, 1, -1)
SetFont(_G.SystemFont_Shadow_Large, NORMAL, 16)
SetFont(_G.SystemFont_Shadow_Large2, NORMAL, 18) -- Auction House ItemDisplay
SetFont(_G.SystemFont_Shadow_Large_Outline, NUMBER, 16, 'OUTLINE')
SetFont(_G.SystemFont_Shadow_Med1, NORMAL, size) -- 12
SetFont(_G.SystemFont_Shadow_Med2, NORMAL, medium) -- 14 -- Shows Order resourses on OrderHallTalentFrame
SetFont(_G.SystemFont_Shadow_Med3, NORMAL, medium) -- 14
SetFont(_G.SystemFont_Shadow_Small, NORMAL, small) -- 10
SetFont(_G.SystemFont_Small, NORMAL, small) -- 10
SetFont(_G.SystemFont_Tiny, NORMAL, tiny) -- 9
SetFont(_G.Tooltip_Med, NORMAL, size) -- 12
SetFont(_G.Tooltip_Small, NORMAL, small) -- 10
SetFont(_G.ZoneTextString, NORMAL, enormous, outline) -- 32
end
end
......@@ -148,6 +148,7 @@ function E:SetupCVars(noDisplayMsg)
SetCVar('chatStyle', 'classic')
SetCVar('wholeChatWindowClickable', 0)
SetCVar('showTutorials', 0)
SetCVar('showNPETutorials', 0)
SetCVar('UberTooltips', 1)
SetCVar('threatWarning', 3)
SetCVar('alwaysShowActionBars', 1)
......
<Ui xmlns='http://www.blizzard.com/wow/ui/'>
<Script file='Patch.lua'/>
<Script file='Core.lua'/>
<Script file='Math.lua'/>
<Script file='API.lua'/>
......
......@@ -202,7 +202,9 @@ local function OnShow(self, r, g, b)
self.text:FontTemplate()
self.text:SetTextColor(r, g, b)
self:SetBackdropBorderColor(r, g, b)
self.forcedBorderColors = {r, g, b}
end
local function UpdateColors()
......@@ -252,7 +254,6 @@ local function UpdateMover(name, parent, textString, overlay, snapOffset, postdr
f.configString = configString
f.perferCorners = perferCorners
f.ignoreSizeChanged = ignoreSizeChanged
f.ignoreBorderColors = true
holder.mover = f
parent.mover = f
......
local issecurevariable = issecurevariable
local hooksecurefunc = hooksecurefunc
local _G = _G
do --taint workarounds by townlong-yak.com (rearranged by Simpy)
--CommunitiesUI - https://www.townlong-yak.com/bugs/Kjq4hm-DisplayModeTaint
if (_G.UIDROPDOWNMENU_OPEN_PATCH_VERSION or 0) < 1 then _G.UIDROPDOWNMENU_OPEN_PATCH_VERSION = 1 end
--CommunitiesUI #2 - https://www.townlong-yak.com/bugs/YhgQma-SetValueRefreshTaint
if (_G.COMMUNITY_UIDD_REFRESH_PATCH_VERSION or 0) < 1 then _G.COMMUNITY_UIDD_REFRESH_PATCH_VERSION = 1 end
--InterfaceOptions - https://www.townlong-yak.com/bugs/gXwH4P-IOFrameSelection
if (_G.IOFRAME_SELECTION_PATCH_VERSION or 0) < 1 then _G.IOFRAME_SELECTION_PATCH_VERSION = 1 end
-- *NOTE* Simpy: these two were updated to fix an issue which was caused on the dropdowns with submenus
--HonorFrameLoadTaint - https://www.townlong-yak.com/bugs/afKy4k-HonorFrameLoadTaint
if (_G.ELVUI_UIDROPDOWNMENU_VALUE_PATCH_VERSION or 0) < 1 then _G.ELVUI_UIDROPDOWNMENU_VALUE_PATCH_VERSION = 1 end
--RefreshOverread - https://www.townlong-yak.com/bugs/Mx7CWN-RefreshOverread
if (_G.ELVUI_UIDD_REFRESH_OVERREAD_PATCH_VERSION or 0) < 1 then _G.ELVUI_UIDD_REFRESH_OVERREAD_PATCH_VERSION = 1 end
if _G.ELVUI_UIDROPDOWNMENU_VALUE_PATCH_VERSION == 1 or _G.UIDROPDOWNMENU_OPEN_PATCH_VERSION == 1 or _G.ELVUI_UIDD_REFRESH_OVERREAD_PATCH_VERSION == 1 then
local function drop(t, k)
local c = 42
t[k] = nil
while not issecurevariable(t, k) do
if t[c] == nil then
t[c] = nil
end
c = c + 1
end
end
hooksecurefunc('UIDropDownMenu_InitializeHelper', function(frame)
if _G.ELVUI_UIDROPDOWNMENU_VALUE_PATCH_VERSION == 1 or _G.ELVUI_UIDD_REFRESH_OVERREAD_PATCH_VERSION == 1 then
for i=1, _G.UIDROPDOWNMENU_MAXLEVELS do
local d = _G['DropDownList' .. i]
if d and d.numButtons then
for j = d.numButtons+1, _G.UIDROPDOWNMENU_MAXBUTTONS do
local b, _ = _G['DropDownList' .. i .. 'Button' .. j]
if _G.ELVUI_UIDROPDOWNMENU_VALUE_PATCH_VERSION == 1 and not (issecurevariable(b, 'value') or b:IsShown()) then
b.value = nil
repeat j, b['fx' .. j] = j+1, nil
until issecurevariable(b, 'value')
end
if _G.ELVUI_UIDD_REFRESH_OVERREAD_PATCH_VERSION == 1 then
_ = issecurevariable(b, 'checked') or drop(b, 'checked')
_ = issecurevariable(b, 'notCheckable') or drop(b, 'notCheckable')
end
end
end
end
end
if _G.UIDROPDOWNMENU_OPEN_PATCH_VERSION == 1 then
if _G.UIDROPDOWNMENU_OPEN_MENU and _G.UIDROPDOWNMENU_OPEN_MENU ~= frame and not issecurevariable(_G.UIDROPDOWNMENU_OPEN_MENU, 'displayMode') then
_G.UIDROPDOWNMENU_OPEN_MENU = nil
local prefix, i = ' \0', 1
repeat i, _G[prefix .. i] = i + 1, nil
until issecurevariable(_G.UIDROPDOWNMENU_OPEN_MENU)
end
end
end)
end
if _G.COMMUNITY_UIDD_REFRESH_PATCH_VERSION == 1 then
local function CleanDropdowns()
if _G.COMMUNITY_UIDD_REFRESH_PATCH_VERSION == 1 then
local f, f2 = _G.FriendsFrame, _G.FriendsTabHeader
local s = f:IsShown()
f:Hide()
f:Show()
if not f2:IsShown() then
f2:Show()
f2:Hide()
end
if not s then
f:Hide()
end
end
end
hooksecurefunc('Communities_LoadUI', CleanDropdowns)
hooksecurefunc('SetCVar', function(n)
if n == 'lastSelectedClubId' then
CleanDropdowns()
end
end)
end
if _G.IOFRAME_SELECTION_PATCH_VERSION == 1 then
_G.InterfaceOptionsFrame:HookScript('OnHide', function()
if _G.IOFRAME_SELECTION_PATCH_VERSION == 1 then
_G.InterfaceOptionsFrameCategories.selection = nil
end
end)
end
end
......@@ -980,6 +980,7 @@ function E:StaticPopup_Show(which, text_arg1, text_arg2, data)
local button1 = _G[dialog:GetName()..'Button1']
local button2 = _G[dialog:GetName()..'Button2']
local button3 = _G[dialog:GetName()..'Button3']
local button4 = _G[dialog:GetName()..'Button4']
do --If there is any recursion in this block, we may get errors (tempButtonLocs is static). If you have to recurse, we'll have to create a new table each time.
assert(#tempButtonLocs == 0); --If this fails, we're recursing. (See the table.wipe at the end of the block)
......@@ -987,6 +988,7 @@ function E:StaticPopup_Show(which, text_arg1, text_arg2, data)
tinsert(tempButtonLocs, button1)