from retail
This commit is contained in:
@@ -961,7 +961,7 @@ local funcs = {
|
||||
orientVertical(self);
|
||||
end
|
||||
end,
|
||||
UpdateEffectiveOrientation = function(self)
|
||||
UpdateEffectiveOrientation = function(self, force)
|
||||
local orientation = self.orientation
|
||||
|
||||
if self.flipX then
|
||||
@@ -979,7 +979,7 @@ local funcs = {
|
||||
end
|
||||
end
|
||||
|
||||
if orientation ~= self.effectiveOrientation then
|
||||
if orientation ~= self.effectiveOrientation or force then
|
||||
self.effectiveOrientation = orientation
|
||||
self:ReOrient()
|
||||
end
|
||||
@@ -1339,7 +1339,7 @@ local function modify(parent, region, data)
|
||||
self:SetHeight(self.bar.totalHeight);
|
||||
icon:SetHeight(self.bar.iconHeight);
|
||||
|
||||
region:UpdateEffectiveOrientation()
|
||||
region:UpdateEffectiveOrientation(true)
|
||||
end
|
||||
-- region:Scale(1.0, 1.0);
|
||||
if data.smoothProgress then
|
||||
|
||||
@@ -1335,12 +1335,15 @@ local function modify(parent, region, data)
|
||||
self.currentWidth = width
|
||||
self.currentHeight = height
|
||||
|
||||
local regionLeft = region:GetLeft()
|
||||
local regionBottom = region:GetBottom()
|
||||
self.background:SetPoint("BOTTOMLEFT", region, "BOTTOMLEFT", minX + -1 * data.borderOffset - regionLeft,
|
||||
minY + -1 * data.borderOffset - regionBottom)
|
||||
self.background:SetPoint("TOPRIGHT", region, "BOTTOMLEFT", maxX + data.borderOffset - regionLeft,
|
||||
maxY + data.borderOffset - regionBottom)
|
||||
if data.border and not data.useAnchorPerUnit then
|
||||
local regionLeft = SafeGetPos(region, region.GetLeft) or minX
|
||||
local regionBottom = SafeGetPos(region, region.GetBottom) or minY
|
||||
if regionLeft and regionBottom then
|
||||
self.background:ClearAllPoints()
|
||||
self.background:SetPoint("BOTTOMLEFT", region, "BOTTOMLEFT", minX + -1 * data.borderOffset - regionLeft, minY + -1 * data.borderOffset - regionBottom)
|
||||
self.background:SetPoint("TOPRIGHT", region, "BOTTOMLEFT", maxX + data.borderOffset - regionLeft, maxY + data.borderOffset - regionBottom)
|
||||
end
|
||||
end
|
||||
else
|
||||
self:Hide()
|
||||
end
|
||||
|
||||
@@ -282,7 +282,7 @@ do
|
||||
Private.StartProfileSystem("model");
|
||||
for id, data in pairs(Private.regions) do
|
||||
Private.StartProfileAura(id);
|
||||
if data.region.toShow then
|
||||
if data.region and data.region.toShow then
|
||||
if (data.regionType == "model") then
|
||||
data.region:PreShow();
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user