Commit 35e891b8 authored by Simpy's avatar Simpy 🐹

12.11

parents 7368352c 4613c809
......@@ -92,12 +92,13 @@ function E:UpdateBlizzardFonts()
SetFont(_G.GameFont_Gigantic, NORMAL, 32) -- Used at the install steps
SetFont(_G.GameFontHighlightMedium, NORMAL, unified and 15 or medium) -- 14 Fix QuestLog Title mouseover
SetFont(_G.GameFontHighlightSmall2, NORMAL, unified or small) -- 11 Skill or Recipe description on TradeSkill frame
SetFont(_G.GameFontHighlightSmall, NORMAL, unified or small) -- 10
SetFont(_G.GameFontNormalHuge2, NORMAL, unified and 24 or huge) -- 24 Mythic weekly best dungeon name
SetFont(_G.GameFontNormalLarge, NORMAL, unified and 16 or large) -- 16
SetFont(_G.GameFontNormalLarge2, NORMAL, unified and 15 or large) -- 18 Garrison Follower Names
SetFont(_G.GameFontNormalMed1, NORMAL, unified and 14 or size) -- 13 WoW Token Info
SetFont(_G.GameFontNormalMed2, NORMAL, unified and 14 or size) -- 14 Quest tracker
SetFont(_G.GameFontNormalMed3, NORMAL, unified and 15 or size) -- 14
SetFont(_G.GameFontNormalMed1, NORMAL, unified and 14 or medium) -- 13 WoW Token Info
SetFont(_G.GameFontNormalMed2, NORMAL, unified and 14 or medium) -- 14 Quest tracker
SetFont(_G.GameFontNormalMed3, NORMAL, unified and 15 or medium) -- 14
SetFont(_G.GameFontNormalSmall2, NORMAL, unified and 12 or small) -- 11 MissionUI Followers names
SetFont(_G.GameTooltipHeader, NORMAL, unified or size) -- 14
SetFont(_G.InvoiceFont_Med, NORMAL, unified and 12 or size) -- 12 Mail
......@@ -131,7 +132,7 @@ function E:UpdateBlizzardFonts()
SetFont(_G.QuestFont_Huge, NORMAL, unified and 15 or huge) -- 18 Quest rewards title(Rewards)
SetFont(_G.QuestFont_Large, NORMAL, unified and 14 or large) -- 14
SetFont(_G.QuestFont_Shadow_Huge, NORMAL, unified and 15 or huge) -- 18 Quest Title
SetFont(_G.QuestFont_Shadow_Small, NORMAL, unified and 14 or small) -- 14
SetFont(_G.QuestFont_Shadow_Small, NORMAL, unified and 14 or size) -- 14
SetFont(_G.QuestFont_Super_Huge, NORMAL, unified and 22 or mega) -- 24
SetFont(_G.ReputationDetailFont, NORMAL, unified or size) -- 10 Rep Desc when clicking a rep
SetFont(_G.SpellFont_Small, NORMAL, 10)
......
......@@ -414,8 +414,14 @@ E.PopupDialogs.APPLY_FONT_WARNING = {
--E.db.nameplate.debuffs.fontSize = fontSize --Dont use this because nameplate font it somewhat smaller than the rest of the font sizes
E.db.actionbar.font = font
--E.db.actionbar.fontSize = fontSize --This may not look good if a big font size is chosen
E.db.auras.font = font
E.db.auras.fontSize = fontSize
E.db.auras.buffs.countFont = font
E.db.auras.buffs.countFontSize = fontSize
E.db.auras.buffs.timeFont = font
E.db.auras.buffs.timeFontSize = fontSize
E.db.auras.debuffs.countFont = font
E.db.auras.debuffs.countFontSize = fontSize
E.db.auras.debuffs.timeFont = font
E.db.auras.debuffs.timeFontSize = fontSize
E.db.chat.font = font
E.db.chat.fontSize = fontSize
E.db.chat.tabFont = font
......
## Interface: 90001
## Author: Elv, Simpy
## Version: 12.10
## Version: 12.11
## Title: |cff1784d1ElvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB
......
......@@ -2,7 +2,7 @@ local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, Private
local AB = E:GetModule('ActionBars')
local _G = _G
local unpack = unpack
local next, unpack = next, unpack
local ipairs, pairs, select, strmatch = ipairs, pairs, select, strmatch
local format, gsub, strsplit, strfind = format, gsub, strsplit, strfind
......@@ -317,11 +317,17 @@ function AB:PositionAndSizeBar(barName)
AB:HandleBackdropMultiplier(bar, backdropSpacing, buttonSpacing, db.widthMult, db.heightMult, anchorUp, anchorLeft, horizontal, lastShownButton, anchorRowButton)
AB:HandleBackdropMover(bar, backdropSpacing)
-- paging needs to be updated even if the bar is disabled
local defaults = AB.barDefaults[barName]
local page = AB:GetPage(barName, defaults.page, defaults.conditions)
RegisterStateDriver(bar, 'page', page)
bar:SetAttribute('page', page)
if not bar.initialized then
bar.initialized = true
if AB.barDefaults['bar'..bar.id].conditions:find('[form,noform]') then
bar:SetAttribute('newCondition', gsub(AB.barDefaults['bar'..bar.id].conditions, ' %[form,noform%] 0; ', ''))
if defaults.conditions:find('[form,noform]') then
bar:SetAttribute('newCondition', gsub(defaults.conditions, ' %[form,noform%] 0; ', ''))
bar:SetAttribute('hasTempBar', true)
else
bar:SetAttribute('hasTempBar', false)
......@@ -329,15 +335,11 @@ function AB:PositionAndSizeBar(barName)
end
if db.enabled or not bar.initialized then
local page = AB:GetPage(barName, AB.barDefaults[barName].page, AB.barDefaults[barName].conditions)
visibility = gsub(visibility, '[\n\r]','')
E:EnableMover(bar.mover:GetName())
RegisterStateDriver(bar, 'visibility', visibility)
RegisterStateDriver(bar, 'page', page)
bar:SetAttribute('page', page)
bar:Show()
E:EnableMover(bar.mover:GetName())
else
E:DisableMover(bar.mover:GetName())
UnregisterStateDriver(bar, 'visibility')
......@@ -360,7 +362,8 @@ function AB:CreateBar(id)
local bar = CreateFrame('Frame', 'ElvUI_Bar'..id, E.UIParent, 'SecureHandlerStateTemplate')
SecureHandlerSetFrameRef(bar, 'MainMenuBarArtFrame', _G.MainMenuBarArtFrame)
local point, anchor, attachTo, x, y = strsplit(',', AB.barDefaults['bar'..id].position)
local defaults = AB.barDefaults['bar'..id]
local point, anchor, attachTo, x, y = strsplit(',', defaults.position)
bar:Point(point, anchor, attachTo, x, y)
bar:SetFrameStrata('LOW')
bar.id = id
......@@ -369,7 +372,7 @@ function AB:CreateBar(id)
bar.backdrop:SetFrameLevel(0)
bar.buttons = {}
bar.bindButtons = AB.barDefaults['bar'..id].bindButtons
bar.bindButtons = defaults.bindButtons
AB:HookScript(bar, 'OnEnter', 'Bar_OnEnter')
AB:HookScript(bar, 'OnLeave', 'Bar_OnLeave')
......@@ -394,7 +397,7 @@ function AB:CreateBar(id)
end
AB:UpdateButtonConfig(bar, bar.bindButtons)
if AB.barDefaults['bar'..id].conditions:find('[form]') then
if defaults.conditions:find('[form]') then
bar:SetAttribute('hasTempBar', true)
else
bar:SetAttribute('hasTempBar', false)
......@@ -1292,6 +1295,20 @@ function AB:PLAYER_ENTERING_WORLD()
AB:AdjustMaxStanceButtons('PLAYER_ENTERING_WORLD')
end
function AB:HandleOverlay()
if AB.db.handleOverlay then
LAB.eventFrame:RegisterEvent('SPELL_ACTIVATION_OVERLAY_GLOW_SHOW')
LAB.eventFrame:RegisterEvent('SPELL_ACTIVATION_OVERLAY_GLOW_HIDE')
else
LAB.eventFrame:UnregisterEvent('SPELL_ACTIVATION_OVERLAY_GLOW_SHOW')
LAB.eventFrame:UnregisterEvent('SPELL_ACTIVATION_OVERLAY_GLOW_HIDE')
for button in next, LAB.activeButtons do
E.Libs.ButtonGlow.HideOverlayGlow(button)
end
end
end
function AB:Initialize()
AB.db = E.db.actionbar
......@@ -1333,6 +1350,7 @@ function AB:Initialize()
AB:UpdatePetCooldownSettings()
AB:ToggleCooldownOptions()
AB:LoadKeyBinder()
AB:HandleOverlay()
AB:RegisterEvent('PLAYER_ENTERING_WORLD')
AB:RegisterEvent('UPDATE_BINDINGS', 'ReassignBindings')
......
......@@ -162,7 +162,7 @@ function A:UpdateIcon(button)
button.count:ClearAllPoints()
button.count:Point('BOTTOMRIGHT', db.countXOffset, db.countYOffset)
button.count:FontTemplate(LSM:Fetch('font', db.countFont), db.countFontSize, db.fontOutline)
button.count:FontTemplate(LSM:Fetch('font', db.countFont), db.countFontSize, db.countFontOutline)
button.text:ClearAllPoints()
button.text:Point('TOP', button, 'BOTTOM', db.timeXOffset, db.timeYOffset)
......@@ -238,7 +238,7 @@ function A:UpdateAura(button, index)
button.texture:SetTexture(texture)
if button.debuffType ~= DebuffType then
local color = button.filter == 'HARMFUL' and _G.DebuffTypeColor[DebuffType] or E.media.bordercolor
local color = button.filter == 'HARMFUL' and _G.DebuffTypeColor[DebuffType] or E.db.general.bordercolor
button:SetBackdropBorderColor(color.r, color.g, color.b)
button.statusBar.backdrop:SetBackdropBorderColor(color.r, color.g, color.b)
end
......
......@@ -4,6 +4,7 @@ local S = E:GetModule('Skins')
local _G = _G
local pairs, unpack = pairs, unpack
local hooksecurefunc = hooksecurefunc
local InCombatLockdown = InCombatLockdown
local headers = {
_G.ObjectiveTrackerBlocksFrame.QuestHeader,
......@@ -85,6 +86,8 @@ local function SkinItemButton(item)
end
local function HandleItemButton(block)
if InCombatLockdown() then return end -- will break quest item button
local item = block and block.itemButton
if not item then return end
......@@ -167,6 +170,8 @@ local function SkinTimerBars(_, _, line)
end
local function PositionFindGroupButton(block, button)
if InCombatLockdown() then return end -- will break quest item button
if button and button.GetPoint then
local a, b, c, d, e = button:GetPoint()
if block.groupFinderButton and b == block.groupFinderButton and block.itemButton and button == block.itemButton then
......@@ -186,6 +191,7 @@ local function SkinFindGroupButton(block)
if block.groupFinderButton and not block.groupFinderButton.skinned then
S:HandleButton(block.groupFinderButton)
block.groupFinderButton:Size(20)
block.groupFinderButton.backdrop:SetFrameLevel(block:GetFrameLevel())
block.groupFinderButton.skinned = true
end
end
......
......@@ -407,6 +407,11 @@ function S:BlizzardQuestFrames()
hooksecurefunc('QuestFrame_SetTitleTextColor', S.QuestFrame_SetTitleTextColor)
hooksecurefunc('QuestFrame_SetTextColor', S.QuestFrame_SetTextColor)
hooksecurefunc('QuestInfo_ShowRequiredMoney', S.QuestInfo_ShowRequiredMoney)
_G.QuestFrameDetailPanel.SealMaterialBG:SetAlpha(0)
_G.QuestFrameRewardPanel.SealMaterialBG:SetAlpha(0)
_G.QuestFrameProgressPanel.SealMaterialBG:SetAlpha(0)
_G.QuestFrameGreetingPanel.SealMaterialBG:SetAlpha(0)
else
S:QuestInfo_StyleScrollFrame(_G.QuestProgressScrollFrame, 506, 615, true)
S:QuestInfo_StyleScrollFrame(_G.QuestGreetingScrollFrame, 506, 615, true)
......
......@@ -41,6 +41,7 @@ function S:WorldMapFrame()
-- Quest Frames
local QuestMapFrame = _G.QuestMapFrame
QuestMapFrame.VerticalSeparator:Hide()
QuestMapFrame:SetScript('OnHide', nil) -- This script would taint the Quest Objective Tracker Button, so unsetting it ~Simpy
if E.private.skins.parchmentRemoverEnable then
QuestMapFrame.DetailsFrame:StripTextures(true)
......
......@@ -1435,7 +1435,7 @@ G.unitframe.aurawatch = {
[193396] = UF:AuraWatch_AddSpell(193396, 'TOPRIGHT', {0.6, 0.2, 0.8}, true), -- Demonic Empowerment
-- Hunter Pets
[272790] = UF:AuraWatch_AddSpell(272790, 'TOPLEFT', {0.89, 0.09, 0.05}, true), -- Frenzy
[290819] = UF:AuraWatch_AddSpell(290819, 'TOPRIGHT', {0.2, 0.8, 0.2}, true), -- Mend Pet
[136] = UF:AuraWatch_AddSpell(290819, 'TOPRIGHT', {0.2, 0.8, 0.2}, true), -- Mend Pet
},
HUNTER = {
[90361] = UF:AuraWatch_AddSpell(90361, 'TOP', {0.34, 0.47, 0.31}), -- Spirit Mend (HoT)
......
......@@ -170,6 +170,7 @@ end
P.databars.threat.hideInCombat = nil -- always on in code
P.databars.experience.hideAtMaxLevel = true
P.databars.experience.showLevel = false
P.databars.experience.width = 348
P.databars.experience.fontSize = 12
P.databars.experience.questCompletedOnly = false
......@@ -2182,7 +2183,7 @@ P.actionbar = {
rightClickSelfCast = false,
desaturateOnCooldown = false,
chargeCooldown = false,
handleOverlay = true,
barPet = {
enabled = true,
mouseover = false,
......
......@@ -215,6 +215,15 @@ E.Options.args.actionbar.args.general = {
name = L["Color Keybind Text"],
desc = L["Color Keybind Text when Out of Range, instead of the button."],
},
handleOverlay = {
order = 27,
type = 'toggle',
name = L["Action Button Glow"],
set = function(_, value)
E.db.actionbar.handleOverlay = value
AB:HandleOverlay()
end,
},
}
},
textGroup = {
......
......@@ -55,6 +55,7 @@ end
E.Options.args.databars.args.experience = ACH:Group(L["Experience"], nil, 1, nil, function(info) return DB.db.experience[info[#info]] end, function(info, value) DB.db.experience[info[#info]] = value DB:ExperienceBar_Update() DB:ExperienceBar_QuestXP() DB:UpdateAll() end)
E.Options.args.databars.args.experience.args = CopyTable(SharedOptions)
E.Options.args.databars.args.experience.args.showLevel = ACH:Toggle(L["Level"], nil, 6)
E.Options.args.databars.args.experience.args.enable.set = function(info, value) DB.db.experience[info[#info]] = value DB:ExperienceBar_Toggle() DB:UpdateAll() end
E.Options.args.databars.args.experience.args.textFormat.set = function(info, value) DB.db.experience[info[#info]] = value DB:ExperienceBar_Update() end
E.Options.args.databars.args.experience.args.conditionGroup.get = function(_, key) return DB.db.experience[key] end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment