diff --git a/skins/blizzard/arena_registrar.lua b/skins/blizzard/arena_registrar.lua index 39e9e57e..0dc6f699 100644 --- a/skins/blizzard/arena_registrar.lua +++ b/skins/blizzard/arena_registrar.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Arena Registrar", "tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() do -- ArenaRegistrarFrame StripTextures(ArenaRegistrarFrame) diff --git a/skins/blizzard/auction.lua b/skins/blizzard/auction.lua index b28c0aa8..979ae4a4 100644 --- a/skins/blizzard/auction.lua +++ b/skins/blizzard/auction.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Auctionhouse", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_AuctionUI", function() -- Compatibility if BrowseResetButton then -- tbc diff --git a/skins/blizzard/battlefield.lua b/skins/blizzard/battlefield.lua index a53258a5..7ff50008 100644 --- a/skins/blizzard/battlefield.lua +++ b/skins/blizzard/battlefield.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Battlefield", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(BattlefieldFrame) CreateBackdrop(BattlefieldFrame, nil, nil, .75) @@ -31,7 +31,7 @@ pfUI:RegisterSkin("Battlefield", "vanilla:tbc", function () BattlefieldFrame.tex2:SetHeight(240) BattlefieldListScrollFrame.maxsize = CreateFrame("Frame", "BattlefieldListScrollFrameMaxSize", BattlefieldFrame) - local offset = 2*(tonumber(pfUI_config.appearance.border.default) + 1) + BattlefieldListScrollFrameScrollBar:GetWidth() + local offset = 2*(border + GetPerfectPixel()) + BattlefieldListScrollFrameScrollBar:GetWidth() BattlefieldListScrollFrame.maxsize:SetPoint("TOPLEFT", BattlefieldListScrollFrame, "TOPLEFT", 0, 0) BattlefieldListScrollFrame.maxsize:SetPoint("BOTTOMRIGHT", BattlefieldListScrollFrame, "BOTTOMRIGHT", offset, 0) CreateBackdrop(BattlefieldListScrollFrame.maxsize, nil, nil, .7) diff --git a/skins/blizzard/battlefield_minimap.lua b/skins/blizzard/battlefield_minimap.lua index 2fe424c2..44967b5a 100644 --- a/skins/blizzard/battlefield_minimap.lua +++ b/skins/blizzard/battlefield_minimap.lua @@ -1,5 +1,5 @@ pfUI:RegisterSkin("Battlefield Minimap", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) + local rawborder, border = GetBorderSize() HookAddonOrVariable("Blizzard_BattlefieldMinimap", function() StripTextures(BattlefieldMinimap) diff --git a/skins/blizzard/battlefield_score.lua b/skins/blizzard/battlefield_score.lua index 28f681e4..922909b2 100644 --- a/skins/blizzard/battlefield_score.lua +++ b/skins/blizzard/battlefield_score.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Battlefield Score", "vanilla", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(WorldStateScoreFrame) CreateBackdrop(WorldStateScoreFrame, nil, nil, .75) diff --git a/skins/blizzard/character.lua b/skins/blizzard/character.lua index 0920c173..9dd90981 100644 --- a/skins/blizzard/character.lua +++ b/skins/blizzard/character.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Character", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() -- Compatibility if PlayerTitleDropDown then -- tbc, wotlk diff --git a/skins/blizzard/dressup.lua b/skins/blizzard/dressup.lua index 6194df40..d618a36c 100644 --- a/skins/blizzard/dressup.lua +++ b/skins/blizzard/dressup.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Dress Up Frame", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(DressUpFrame, nil, "ARTWORK") CreateBackdrop(DressUpFrame, nil, nil, .75) diff --git a/skins/blizzard/friends.lua b/skins/blizzard/friends.lua index 22b6b6c1..52591c8d 100644 --- a/skins/blizzard/friends.lua +++ b/skins/blizzard/friends.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Friends", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() local maxtab = pfUI.expansion == "vanilla" and 4 or 5 StripTextures(FriendsFrame, true) diff --git a/skins/blizzard/guildbank.lua b/skins/blizzard/guildbank.lua index d428fb3c..c33d37b4 100644 --- a/skins/blizzard/guildbank.lua +++ b/skins/blizzard/guildbank.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Guild Bank", "tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_GuildBankUI", function() do -- GuildBankFrame diff --git a/skins/blizzard/help.lua b/skins/blizzard/help.lua index c96bb313..b47060b7 100644 --- a/skins/blizzard/help.lua +++ b/skins/blizzard/help.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Help", "vanilla", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(HelpFrame) CreateBackdrop(HelpFrame, nil, nil, .75) diff --git a/skins/blizzard/inspect.lua b/skins/blizzard/inspect.lua index b93fe2b0..b19abbd2 100644 --- a/skins/blizzard/inspect.lua +++ b/skins/blizzard/inspect.lua @@ -21,8 +21,8 @@ local slots = { } pfUI:RegisterSkin("Inspect", "tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_InspectUI", function() CreateBackdrop(InspectFrame, nil, nil, .75) @@ -126,8 +126,8 @@ pfUI:RegisterSkin("Inspect", "tbc", function () end) pfUI:RegisterSkin("Inspect", "vanilla", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_InspectUI", function() local cache = {} diff --git a/skins/blizzard/keybindings.lua b/skins/blizzard/keybindings.lua index 462f97a6..049aac20 100644 --- a/skins/blizzard/keybindings.lua +++ b/skins/blizzard/keybindings.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("KeyBindings", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_BindingUI", function() StripTextures(KeyBindingFrame) diff --git a/skins/blizzard/lfg.lua b/skins/blizzard/lfg.lua index 7ced0a66..f6cdadbc 100644 --- a/skins/blizzard/lfg.lua +++ b/skins/blizzard/lfg.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Looking for group", "tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() CreateBackdrop(LFGParentFrame, nil, nil, .75) CreateBackdropShadow(LFGParentFrame) diff --git a/skins/blizzard/macro.lua b/skins/blizzard/macro.lua index a2d91fc9..890ad6bc 100644 --- a/skins/blizzard/macro.lua +++ b/skins/blizzard/macro.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Macro", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_MacroUI", function() StripTextures(MacroFrame) diff --git a/skins/blizzard/mail.lua b/skins/blizzard/mail.lua index 8b740857..6db3d252 100644 --- a/skins/blizzard/mail.lua +++ b/skins/blizzard/mail.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Mailbox", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() -- Compatibility local StationeryBackgroundLeft, StationeryBackgroundRight diff --git a/skins/blizzard/merchant.lua b/skins/blizzard/merchant.lua index ed2f224d..167874c8 100644 --- a/skins/blizzard/merchant.lua +++ b/skins/blizzard/merchant.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Merchant", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() -- Compatibility if MerchantGuildBankRepairButton then -- tbc diff --git a/skins/blizzard/options-interface.lua b/skins/blizzard/options-interface.lua index ae7ebfc6..a46b0fb5 100644 --- a/skins/blizzard/options-interface.lua +++ b/skins/blizzard/options-interface.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Options - Interface", "tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(InterfaceOptionsFrame) CreateBackdrop(InterfaceOptionsFrame, nil, nil, .75) @@ -75,8 +75,8 @@ pfUI:RegisterSkin("Options - Interface", "tbc", function () end) pfUI:RegisterSkin("Options - Interface", "vanilla", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() UIOptionsFrame:SetParent(UIParent) UIOptionsFrame:SetWidth(1024) diff --git a/skins/blizzard/options-sound.lua b/skins/blizzard/options-sound.lua index 5594665e..341486ab 100644 --- a/skins/blizzard/options-sound.lua +++ b/skins/blizzard/options-sound.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Options - Sound", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() -- Compatibility local SoundOptionsFrameHeaderText, NUM_CHECKBOXES, NUM_SLIDERS diff --git a/skins/blizzard/options-video.lua b/skins/blizzard/options-video.lua index 85ed3424..70c7e325 100644 --- a/skins/blizzard/options-video.lua +++ b/skins/blizzard/options-video.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Options - Video", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() -- Compatibility local MAX_SLIDERS, MAX_CHECKBOXES diff --git a/skins/blizzard/petition.lua b/skins/blizzard/petition.lua index 9f573bfe..4cf27687 100644 --- a/skins/blizzard/petition.lua +++ b/skins/blizzard/petition.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Petition", "vanilla", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(PetitionFrame) CreateBackdrop(PetitionFrame, nil, nil, .75) diff --git a/skins/blizzard/professions.lua b/skins/blizzard/professions.lua index 426a5aaf..e4a57c46 100644 --- a/skins/blizzard/professions.lua +++ b/skins/blizzard/professions.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Profession", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() local frames = { ["TradeSkill"] = { "Blizzard_TradeSkillUI", "TRADE_SKILLS_DISPLAYED", "TradeSkillSkill", "MAX_TRADE_SKILL_REAGENTS" }, diff --git a/skins/blizzard/questlog.lua b/skins/blizzard/questlog.lua index d6eb6ada..2d3d8b88 100644 --- a/skins/blizzard/questlog.lua +++ b/skins/blizzard/questlog.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Quest Log", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() _G.QUESTS_DISPLAYED = 23 _G.MAX_WATCHABLE_QUESTS = 20 -- TODO diff --git a/skins/blizzard/socket.lua b/skins/blizzard/socket.lua index 0ae80823..f2c2aeec 100644 --- a/skins/blizzard/socket.lua +++ b/skins/blizzard/socket.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Item Socketing", "tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_ItemSocketingUI", function() StripTextures(ItemSocketingFrame) diff --git a/skins/blizzard/spellbook.lua b/skins/blizzard/spellbook.lua index 0a78a41c..18da029b 100644 --- a/skins/blizzard/spellbook.lua +++ b/skins/blizzard/spellbook.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Spellbook", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(SpellBookFrame) CreateBackdrop(SpellBookFrame, nil, nil, .75) diff --git a/skins/blizzard/tabard.lua b/skins/blizzard/tabard.lua index 1e5f241f..e8e48c21 100644 --- a/skins/blizzard/tabard.lua +++ b/skins/blizzard/tabard.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Guild Tabard", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(TabardFrame) CreateBackdrop(TabardFrame, nil, nil, .75) diff --git a/skins/blizzard/talents.lua b/skins/blizzard/talents.lua index cfcd9906..f26e5a4c 100644 --- a/skins/blizzard/talents.lua +++ b/skins/blizzard/talents.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Talents", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_TalentUI", function() -- Compatibility diff --git a/skins/blizzard/time_manager.lua b/skins/blizzard/time_manager.lua index 935eee84..a0c3c321 100644 --- a/skins/blizzard/time_manager.lua +++ b/skins/blizzard/time_manager.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Time Manager", "tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_TimeManager", function() do -- TimeManagerFrame diff --git a/skins/blizzard/tooltips.lua b/skins/blizzard/tooltips.lua index 8753cee6..c050c541 100644 --- a/skins/blizzard/tooltips.lua +++ b/skins/blizzard/tooltips.lua @@ -1,5 +1,5 @@ pfUI:RegisterSkin("Tooltips", "vanilla:tbc", function () - local border = tonumber(C.appearance.border.default) + local rawborder, border = GetBorderSize() local alpha = tonumber(C.tooltip.alpha) for _, tooltip in pairs({GameTooltip, ItemRefTooltip, ShoppingTooltip1, ShoppingTooltip2}) do diff --git a/skins/blizzard/trade.lua b/skins/blizzard/trade.lua index 9b8a2a9a..a71d57bd 100644 --- a/skins/blizzard/trade.lua +++ b/skins/blizzard/trade.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Trade", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() StripTextures(TradeFrame) CreateBackdrop(TradeFrame, nil, nil, .75) diff --git a/skins/blizzard/trainer.lua b/skins/blizzard/trainer.lua index 179a992f..8b208fca 100644 --- a/skins/blizzard/trainer.lua +++ b/skins/blizzard/trainer.lua @@ -1,6 +1,6 @@ pfUI:RegisterSkin("Trainer", "vanilla:tbc", function () - local border = tonumber(pfUI_config.appearance.border.default) - local bpad = border > 1 and border - 1 or 1 + local rawborder, border = GetBorderSize() + local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel() HookAddonOrVariable("Blizzard_TrainerUI", function() StripTextures(ClassTrainerFrame)