From bae862f02fdbfca59e838b8d8215ceb300065ee2 Mon Sep 17 00:00:00 2001 From: Crum Date: Sun, 13 Jan 2019 19:59:06 -0600 Subject: [PATCH] update --- ElvUI/Modules/UnitFrames/Groups/Party.lua | 29 ++++++++++++---------- ElvUI/Modules/UnitFrames/Groups/Raid.lua | 2 ++ ElvUI/Modules/UnitFrames/Groups/Raid40.lua | 2 ++ ElvUI/Modules/UnitFrames/Units/Player.lua | 4 +-- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ElvUI/Modules/UnitFrames/Groups/Party.lua b/ElvUI/Modules/UnitFrames/Groups/Party.lua index 4af9093..8ad12e0 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Party.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Party.lua @@ -27,7 +27,6 @@ function UF:Construct_PartyFrames() if self.isChild then self.Health = UF:Construct_HealthBar(self, true) - self.RaidRoleFramesAnchor = UF:Construct_RaidRoleFrames(self) self.MouseGlow = UF:Construct_MouseGlow(self) self.TargetGlow = UF:Construct_TargetGlow(self) self.Name = UF:Construct_NameText(self) @@ -64,6 +63,7 @@ function UF:Construct_PartyFrames() self.AuraWatch = UF:Construct_AuraWatch(self) self.RaidDebuffs = UF:Construct_RaidDebuffs(self) self.DebuffHighlight = UF:Construct_DebuffHighlight(self) + self.RaidRoleFramesAnchor = UF:Construct_RaidRoleFrames(self) self.MouseGlow = UF:Construct_MouseGlow(self) self.TargetGlow = UF:Construct_TargetGlow(self) self.RaidTargetIndicator = UF:Construct_RaidIcon(self) @@ -83,18 +83,6 @@ function UF:Construct_PartyFrames() return self end -function UF:PartySmartVisibility() - if not self then self = this end - if not self.db or (self.db and not self.db.enable) then return end - - local numMembers = GetNumRaidMembers() - if numMembers < 1 then - self:Show() - else - self:Hide() - end -end - function UF:Update_PartyHeader(header, db) header.db = db @@ -103,6 +91,7 @@ function UF:Update_PartyHeader(header, db) E:Point(header, "BOTTOMLEFT", E.UIParent, "BOTTOMLEFT", 4, 195) E:CreateMover(header, header:GetName().."Mover", L["Party Frames"], nil, nil, nil, "ALL,PARTY") + header.positioned = true header:RegisterEvent("PLAYER_LOGIN") header:RegisterEvent("ZONE_CHANGED_NEW_AREA") @@ -115,6 +104,18 @@ function UF:Update_PartyHeader(header, db) UF.PartySmartVisibility(header) end +function UF:PartySmartVisibility() + if not self then self = this end + if not self.db or (self.db and not self.db.enable) then return end + + local numMembers = GetNumRaidMembers() + if numMembers < 1 then + self:Show() + else + self:Hide() + end +end + function UF:Update_PartyFrames(frame, db) frame.db = db @@ -201,6 +202,8 @@ function UF:Update_PartyFrames(frame, db) UF:UpdateNameSettings(frame, frame.childType) else + E:Size(frame, frame.UNIT_WIDTH, frame.UNIT_HEIGHT) + UF:Configure_InfoPanel(frame) UF:Configure_HealthBar(frame) diff --git a/ElvUI/Modules/UnitFrames/Groups/Raid.lua b/ElvUI/Modules/UnitFrames/Groups/Raid.lua index a397c65..47eeaa5 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Raid.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Raid.lua @@ -134,6 +134,8 @@ function UF:Update_RaidFrames(frame, db) frame.VARIABLES_SET = true end + E:Size(frame, frame.UNIT_WIDTH, frame.UNIT_HEIGHT) + UF:Configure_InfoPanel(frame) UF:Configure_HealthBar(frame) diff --git a/ElvUI/Modules/UnitFrames/Groups/Raid40.lua b/ElvUI/Modules/UnitFrames/Groups/Raid40.lua index c6ca028..2985a72 100644 --- a/ElvUI/Modules/UnitFrames/Groups/Raid40.lua +++ b/ElvUI/Modules/UnitFrames/Groups/Raid40.lua @@ -135,6 +135,8 @@ function UF:Update_Raid40Frames(frame, db) frame.VARIABLES_SET = true end + E:Size(frame, frame.UNIT_WIDTH, frame.UNIT_HEIGHT) + UF:Configure_InfoPanel(frame) UF:Configure_HealthBar(frame) diff --git a/ElvUI/Modules/UnitFrames/Units/Player.lua b/ElvUI/Modules/UnitFrames/Units/Player.lua index 3cb70d1..5e3dc34 100644 --- a/ElvUI/Modules/UnitFrames/Units/Player.lua +++ b/ElvUI/Modules/UnitFrames/Units/Player.lua @@ -28,9 +28,7 @@ function UF:Construct_PlayerFrame(frame) if CAN_HAVE_CLASSBAR then frame.ClassBarHolder = CreateFrame("Frame", nil, frame) E:Point(frame.ClassBarHolder, "BOTTOM", E.UIParent, "BOTTOM", 0, 150) - end - if E.myclass == "DRUID" then frame.DruidAltMana = self:Construct_DruidAltMana(frame) frame.ClassBar = "DruidAltMana" end @@ -145,4 +143,4 @@ function UF:Update_PlayerFrame(frame, db) frame:UpdateAllElements("ElvUI_UpdateAllElements") end -tinsert(UF.unitstoload, "player") \ No newline at end of file +tinsert(UF.unitstoload, "player")