Skip to content

Commit c44697c

Browse files
committed
Fixed, Pets healths were not updated.
Now grid2 frame position is restored if the UI scale is changed.
1 parent bb68c80 commit c44697c

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

GridLayout.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ end
245245

246246
--{{{ Event handlers
247247
function Grid2Layout:Grid_GroupTypeChanged(_, groupType, instType, maxPlayers)
248-
Grid2Layout:Debug("GroupTypeChanged", groupType, instType, maxPlayers)
248+
self:Debug("GroupTypeChanged", groupType, instType, maxPlayers)
249249
if not Grid2:ReloadTheme() then
250250
if not self:ReloadLayout() then
251251
self:UpdateVisibility()
@@ -280,6 +280,7 @@ end
280280
-- Maintain Grid2 window on the same position if the screen scale is changed.
281281
function Grid2Layout:UI_SCALE_CHANGED()
282282
self:RestorePosition()
283+
self:Debug("UI Scale Change detected: main frame position restored:", GetCVar("uiScale") )
283284
end
284285

285286
-- We delay UpdateSize() call to avoid calculating the wrong window size, because when "Grid_UpdateLayoutSize"

GridRoster.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ do
6464
indexes[unit] = index
6565
indexes[pet] = index
6666
unit_is_valid[unit] = true
67+
unit_is_valid[pet] = true
6768
end
6869
register_unit(party_units, "player", "pet", 0, party_indexes)
6970
for i = 1, MAX_PARTY_MEMBERS do

Options/GridWidgets.lua

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ do
5555
if text:find( "^spell:%d+$" ) then
5656
tooltip:SetHyperlink(text)
5757
else
58-
tooltip:SetText( text , 1, 1, 1, 1, true)
58+
tooltip:SetText(text , 1, 1, 1, 1, true)
5959
end
6060
tooltip:Show()
6161
end
6262

6363
local function OnEnter(frame)
64-
self = frame.obj
6564
local desc = frame.obj.userdata.option.desc
6665
if desc then
6766
ShowTooltip(frame, desc)

modules/IndicatorIcons.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ local function Icon_Layout(self, parent)
158158
-- cooldown animation
159159
if self.showCooldown then
160160
frame.cooldown = frame.cooldown or CreateFrame("Cooldown", frameName and frameName..i or nil, frame, "CooldownFrameTemplate")
161+
frame.cooldown:SetAllPoints()
161162
frame.cooldown:SetHideCountdownNumbers(true)
162163
frame.cooldown:SetDrawEdge(self.dbx.disableOmniCC~=nil)
163164
frame.cooldown.noCooldownCount = self.dbx.disableOmniCC
164165
frame.cooldown:SetReverse(self.dbx.reverseCooldown)
165-
frame.cooldown:SetAllPoints()
166166
frame.cooldown:Show()
167167
elseif frame.cooldown then
168168
frame.cooldown:Hide()

0 commit comments

Comments
 (0)