# HG changeset patch # User Nenue # Date 1476770222 14400 # Node ID 4ec4fd89fced50a95b02194d560e1113918d6e50 # Parent be813a9d99c08f425258d6912a50db99ac04fa9d - order of operations regarding frame visibility checking - interaction with WorldPlan OrderHall module - fancy shmancy transition fades resulting from above diff -r be813a9d99c0 -r 4ec4fd89fced Modules/OrderHall.lua --- a/Modules/OrderHall.lua Mon Oct 17 13:00:26 2016 -0400 +++ b/Modules/OrderHall.lua Tue Oct 18 01:57:02 2016 -0400 @@ -46,6 +46,10 @@ frame:SetShown(true) self:Show() end + function frame.HidePanel(frame) + frame:SetShown(false) + self:UpdateSize() + end end self:SetOrderHallUIMods() end @@ -99,9 +103,9 @@ elseif event == 'PLAYER_ENTERING_WORLD' then self:Update() elseif event == 'PLAYER_REGEN_ENABLED' then - self:Show() + self:SetShown(true) elseif event == 'PLAYER_REGEN_DISABLED' then - self:Hide() + self:SetShown(false) end end @@ -294,7 +298,7 @@ end hasNewInfo = (self.progressAmount ~= xp) - progressChange = (hasNewInfo and not self.modeChanged) and (xp - self.progressAmount) / self:GetWidth() + progressChange = (hasNewInfo and not self.modeChanged) and ((xp - self.progressAmount) / xpMax) self.progressAmount = xp @@ -307,7 +311,7 @@ if itemID then local nextRankCost = GetCostForPointAtRank(pointsSpent) or 0 hasNewInfo = (self.progressAmount ~= totalXP) - progressChange = (hasNewInfo and not self.modeChanged) and (totalXP - self.progressAmount) / self:GetWidth() + progressChange = (hasNewInfo and not self.modeChanged) and (((totalXP - self.progressAmount) / nextRankCost)) if totalXP > nextRankCost then self.progressPercent = 1 @@ -370,7 +374,7 @@ self.ProgressBar:Hide() end else - self:Hide() + self:HidePanel() end self.modeChanged = nil diff -r be813a9d99c0 -r 4ec4fd89fced Veneer.xml --- a/Veneer.xml Mon Oct 17 13:00:26 2016 -0400 +++ b/Veneer.xml Tue Oct 18 01:57:02 2016 -0400 @@ -279,10 +279,10 @@ - + - print('VnWorldState','fade out') + --print('VnWorldState','fade out') self:GetParent():Hide() @@ -296,7 +296,7 @@ self:GetParent():ShowPanel() self:GetParent().timeLived = 0 - print('VnWorldState', 'fade in') + --print('VnWorldState', 'fade in') self:GetParent().timeLived = 0