Skip to content

Commit

Permalink
Fixed, Pets healths were not updated.
Browse files Browse the repository at this point in the history
Now grid2 frame position is restored if the UI scale is changed.
  • Loading branch information
michaelnpsp committed Dec 19, 2020
1 parent bb68c80 commit c44697c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion GridLayout.lua
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ end

--{{{ Event handlers
function Grid2Layout:Grid_GroupTypeChanged(_, groupType, instType, maxPlayers)
Grid2Layout:Debug("GroupTypeChanged", groupType, instType, maxPlayers)
self:Debug("GroupTypeChanged", groupType, instType, maxPlayers)
if not Grid2:ReloadTheme() then
if not self:ReloadLayout() then
self:UpdateVisibility()
Expand Down Expand Up @@ -280,6 +280,7 @@ end
-- Maintain Grid2 window on the same position if the screen scale is changed.
function Grid2Layout:UI_SCALE_CHANGED()
self:RestorePosition()
self:Debug("UI Scale Change detected: main frame position restored:", GetCVar("uiScale") )
end

-- We delay UpdateSize() call to avoid calculating the wrong window size, because when "Grid_UpdateLayoutSize"
Expand Down
1 change: 1 addition & 0 deletions GridRoster.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ do
indexes[unit] = index
indexes[pet] = index
unit_is_valid[unit] = true
unit_is_valid[pet] = true
end
register_unit(party_units, "player", "pet", 0, party_indexes)
for i = 1, MAX_PARTY_MEMBERS do
Expand Down
3 changes: 1 addition & 2 deletions Options/GridWidgets.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@ do
if text:find( "^spell:%d+$" ) then
tooltip:SetHyperlink(text)
else
tooltip:SetText( text , 1, 1, 1, 1, true)
tooltip:SetText(text , 1, 1, 1, 1, true)
end
tooltip:Show()
end

local function OnEnter(frame)
self = frame.obj
local desc = frame.obj.userdata.option.desc
if desc then
ShowTooltip(frame, desc)
Expand Down
2 changes: 1 addition & 1 deletion modules/IndicatorIcons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ local function Icon_Layout(self, parent)
-- cooldown animation
if self.showCooldown then
frame.cooldown = frame.cooldown or CreateFrame("Cooldown", frameName and frameName..i or nil, frame, "CooldownFrameTemplate")
frame.cooldown:SetAllPoints()
frame.cooldown:SetHideCountdownNumbers(true)
frame.cooldown:SetDrawEdge(self.dbx.disableOmniCC~=nil)
frame.cooldown.noCooldownCount = self.dbx.disableOmniCC
frame.cooldown:SetReverse(self.dbx.reverseCooldown)
frame.cooldown:SetAllPoints()
frame.cooldown:Show()
elseif frame.cooldown then
frame.cooldown:Hide()
Expand Down

0 comments on commit c44697c

Please sign in to comment.