mirror of
https://github.com/brues-code/pfUI.git
synced 2026-11-09 03:38:58 +00:00
Frame sizes: measure anchor-sized regions with the unscaled getters
GetWidth/GetHeight return an anchor-sized region's size times its effective scale, so at any UI scale but 1 they disagreed with the sizes and offsets built from them. The craft spark, raid-marker name shortening, unit frame indicators, dropdown widening and the cooldown font's first size now read GetUnscaledWidth/GetUnscaledHeight. The combat log and the settings rows drop their GetRight()-GetLeft() workarounds for the same bug.
This commit is contained in:
+2
-2
@@ -85,7 +85,7 @@ local function SetupCooldown(cooldown)
|
|||||||
cooldown:SetReverse(kind == "aura")
|
cooldown:SetReverse(kind == "aura")
|
||||||
cooldown:SetMinimumCountdownDuration(kind == "spell" and tonumber(C.cooldown.threshold) * 1000 or 0)
|
cooldown:SetMinimumCountdownDuration(kind == "spell" and tonumber(C.cooldown.threshold) * 1000 or 0)
|
||||||
cooldown:SetCountdownFormatter(GetFormatter())
|
cooldown:SetCountdownFormatter(GetFormatter())
|
||||||
UpdateFont(cooldown, cooldown:GetParent():GetHeight())
|
UpdateFont(cooldown, cooldown:GetParent():GetUnscaledHeight())
|
||||||
end
|
end
|
||||||
|
|
||||||
-- applies the "foreign" timers to another addon's cooldown. They only take
|
-- applies the "foreign" timers to another addon's cooldown. They only take
|
||||||
@@ -107,7 +107,7 @@ local function SetupForeign(cooldown)
|
|||||||
|
|
||||||
cooldown:SetMinimumCountdownDuration(tonumber(C.cooldown.threshold) * 1000)
|
cooldown:SetMinimumCountdownDuration(tonumber(C.cooldown.threshold) * 1000)
|
||||||
cooldown:SetCountdownFormatter(GetFormatter())
|
cooldown:SetCountdownFormatter(GetFormatter())
|
||||||
UpdateFont(cooldown, (cooldown:GetParent() or cooldown):GetHeight())
|
UpdateFont(cooldown, (cooldown:GetParent() or cooldown):GetUnscaledHeight())
|
||||||
end
|
end
|
||||||
|
|
||||||
-- runs as a pfUI cooldown's timer starts: a timer with a total brings back
|
-- runs as a pfUI cooldown's timer starts: a timer with a total brings back
|
||||||
|
|||||||
+1
-1
@@ -601,7 +601,7 @@ function pfUI.api.SkinDropDown(frame, cr, cg, cb, useSmall)
|
|||||||
|
|
||||||
button:HookScript("OnClick", function()
|
button:HookScript("OnClick", function()
|
||||||
local DropDownListWidth = DropDownList1:GetWidth()
|
local DropDownListWidth = DropDownList1:GetWidth()
|
||||||
local DropDownFrameWidth = frame.backdrop:GetWidth()
|
local DropDownFrameWidth = frame.backdrop:GetUnscaledWidth()
|
||||||
if DropDownListWidth < DropDownFrameWidth then
|
if DropDownListWidth < DropDownFrameWidth then
|
||||||
local diff = DropDownFrameWidth - DropDownListWidth
|
local diff = DropDownFrameWidth - DropDownListWidth
|
||||||
DropDownList1:SetWidth(DropDownList1:GetWidth() + diff)
|
DropDownList1:SetWidth(DropDownList1:GetWidth() + diff)
|
||||||
|
|||||||
+2
-2
@@ -2042,7 +2042,7 @@ function pfUI.uf:RefreshUnit(unit, component)
|
|||||||
local size
|
local size
|
||||||
|
|
||||||
if disptype == "4" or disptype == "3" then
|
if disptype == "4" or disptype == "3" then
|
||||||
size = unit.hp.bar:GetHeight() * tonumber(unit.config.debuff_ind_size)
|
size = unit.hp.bar:GetUnscaledHeight() * tonumber(unit.config.debuff_ind_size)
|
||||||
if size ~= indicator.size or disptype ~= indicator.disp or indipos ~= indicator.ipos then
|
if size ~= indicator.size or disptype ~= indicator.disp or indipos ~= indicator.ipos then
|
||||||
indicator:ClearAllPoints()
|
indicator:ClearAllPoints()
|
||||||
indicator:SetPoint(indipos, 0, 0)
|
indicator:SetPoint(indipos, 0, 0)
|
||||||
@@ -2447,7 +2447,7 @@ function pfUI.uf:AddIcon(frame, pos, icon, timeleft, stacks, start, duration)
|
|||||||
|
|
||||||
if not frame.hp then return end
|
if not frame.hp then return end
|
||||||
local frame = frame.hp.bar
|
local frame = frame.hp.bar
|
||||||
if pos > 6 or pos > ceil(frame:GetWidth() / iconsize) then return end
|
if pos > 6 or pos > ceil(frame:GetUnscaledWidth() / iconsize) then return end
|
||||||
|
|
||||||
frame.icon = frame.icon or CreateFrame("Frame", nil, frame)
|
frame.icon = frame.icon or CreateFrame("Frame", nil, frame)
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -86,7 +86,7 @@ pfUI:RegisterModule("castbar", function ()
|
|||||||
-- Per-craft spark position: the current craft's share of the bar's width.
|
-- Per-craft spark position: the current craft's share of the bar's width.
|
||||||
-- Snaps back to the left edge each time StartTradeskillCraft restarts it.
|
-- Snaps back to the left edge each time StartTradeskillCraft restarts it.
|
||||||
local function MoveSpark()
|
local function MoveSpark()
|
||||||
local x = this.craft:GetElapsedPercent() * this.bar:GetWidth() - 1
|
local x = this.craft:GetElapsedPercent() * this.bar:GetUnscaledWidth() - 1
|
||||||
this.bar.spark:SetPoint("TOP", this.bar, "TOPLEFT", x, 0)
|
this.bar.spark:SetPoint("TOP", this.bar, "TOPLEFT", x, 0)
|
||||||
this.bar.spark:SetPoint("BOTTOM", this.bar, "BOTTOMLEFT", x, 0)
|
this.bar.spark:SetPoint("BOTTOM", this.bar, "BOTTOMLEFT", x, 0)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2509,13 +2509,7 @@ pfUI:RegisterModule("combatlog", function ()
|
|||||||
local buttonName, button, textWidth;
|
local buttonName, button, textWidth;
|
||||||
local buttonIndex = 1;
|
local buttonIndex = 1;
|
||||||
-- subtract the width of the dropdown button
|
-- subtract the width of the dropdown button
|
||||||
local clogleft, clogright = COMBATLOG:GetRight(), COMBATLOG:GetLeft();
|
local maxWidth = COMBATLOG:GetUnscaledWidth() - 31;
|
||||||
local maxWidth;
|
|
||||||
if ( clogleft and clogright ) then
|
|
||||||
maxWidth = (COMBATLOG:GetRight()-COMBATLOG:GetLeft())-31; --Hacky hacky because GetWidth goes crazy when it is docked
|
|
||||||
else
|
|
||||||
maxWidth = COMBATLOG:GetWidth() - 31;
|
|
||||||
end
|
|
||||||
|
|
||||||
local additionalFilterButton = CombatLogQuickButtonFrame.AdditionalFilterButton;
|
local additionalFilterButton = CombatLogQuickButtonFrame.AdditionalFilterButton;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -78,7 +78,7 @@ pfUI:RegisterModule("gui", function ()
|
|||||||
|
|
||||||
-- basic frame
|
-- basic frame
|
||||||
local frame = CreateFrame("Frame", nil, this)
|
local frame = CreateFrame("Frame", nil, this)
|
||||||
frame:SetWidth(this.parent:GetRight()-this.parent:GetLeft()-20)
|
frame:SetWidth(this.parent:GetUnscaledWidth()-20)
|
||||||
frame:SetHeight(22)
|
frame:SetHeight(22)
|
||||||
frame:SetPoint("TOPLEFT", this, "TOPLEFT", 5, (this.objectCount*-23)-5)
|
frame:SetPoint("TOPLEFT", this, "TOPLEFT", 5, (this.objectCount*-23)-5)
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ pfUI:RegisterModule("marktracking", function ()
|
|||||||
|
|
||||||
local function ShortenName(name, row)
|
local function ShortenName(name, row)
|
||||||
if not name or name == "" then return "" end
|
if not name or name == "" then return "" end
|
||||||
local barWidth = row.health:GetWidth()
|
local barWidth = row.health:GetUnscaledWidth()
|
||||||
if barWidth < 1 then barWidth = BAR_WIDTH end
|
if barWidth < 1 then barWidth = BAR_WIDTH end
|
||||||
local available = barWidth - 4
|
local available = barWidth - 4
|
||||||
if rm_showpct then available = available - 32 end
|
if rm_showpct then available = available - 32 end
|
||||||
|
|||||||
Reference in New Issue
Block a user