From f56a8289646c1acc23485fc6562d2fd2c900178a Mon Sep 17 00:00:00 2001 From: Lanerra Date: Sat, 23 Nov 2013 01:39:13 -0800 Subject: [PATCH] - Finally fixed the raid layout - Reverted texture change - Version bump --- media/Border.tga | Bin 4377 -> 16428 bytes oUF_Lanerra.lua | 106 ++++++++++++++++++++++++++++++++++++++++-------------- oUF_Lanerra.toc | 2 +- 3 files changed, 81 insertions(+), 27 deletions(-) diff --git a/media/Border.tga b/media/Border.tga index f3d4b68ea72bfb2f9316eb36b6ded7ce854d339f..080087ee8263963a4409157fcba8141e0cec7149 100644 GIT binary patch literal 16428 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 diff --git a/oUF_Lanerra.lua b/oUF_Lanerra.lua index 731872e..26a07b1 100644 --- a/oUF_Lanerra.lua +++ b/oUF_Lanerra.lua @@ -9,8 +9,9 @@ -- Kill some unneeded settings ------------------------------------------------- -InterfaceOptionsFrameCategoriesButton10:SetScale(0.00001) -InterfaceOptionsFrameCategoriesButton10:SetAlpha(0) +InterfaceOptionsFrameCategoriesButton11:SetScale(0.00001) +InterfaceOptionsFrameCategoriesButton11:SetAlpha(0) + ------------------------------------------------- -- Kill some unitframe stuff @@ -516,12 +517,12 @@ end local Stylish = function(self, unit, isSingle) self.menu = CreateDropDown - self:SetScript("OnEnter", UnitFrame_OnEnter) - self:SetScript("OnLeave", UnitFrame_OnLeave) + self:SetScript('OnEnter', UnitFrame_OnEnter) + self:SetScript('OnLeave', UnitFrame_OnLeave) self.ignoreHealComm = true --- print("Spawn", self:GetName(), unit) +-- print('Spawn', self:GetName(), unit) self:EnableMouse(true) self:RegisterForClicks('AnyUp') @@ -913,7 +914,7 @@ local Stylish = function(self, unit, isSingle) end self.Debuffs = CreateFrame('Frame', nil, self) - self.Debuffs:SetPoint("BOTTOMLEFT", self, "TOPLEFT", 0, 24) + self.Debuffs:SetPoint('BOTTOMLEFT', self, 'TOPLEFT', 0, 24) self.Debuffs:SetWidth((Settings.Units.Target.Height * NUM_DEBUFFS - 1) + (GAP * (NUM_DEBUFFS - 1))) self.Debuffs:SetHeight((Settings.Units.Target.Height * 2) + (GAP * 2)) @@ -1139,12 +1140,12 @@ end local function StylishGroup(self, unit) self.menu = CreateDropDown - self:SetScript("OnEnter", UnitFrame_OnEnter) - self:SetScript("OnLeave", UnitFrame_OnLeave) + self:SetScript('OnEnter', UnitFrame_OnEnter) + self:SetScript('OnLeave', UnitFrame_OnLeave) self.ignoreHealComm = true --- print("Spawn", self:GetName(), unit) +-- print('Spawn', self:GetName(), unit) self:EnableMouse(true) self:RegisterForClicks('AnyUp') @@ -1324,12 +1325,12 @@ oUF:RegisterStyle('oUF_Lanerra_Group', StylishGroup) local function StylishRaid(self, unit) self.menu = CreateDropDown - self:SetScript("OnEnter", UnitFrame_OnEnter) - self:SetScript("OnLeave", UnitFrame_OnLeave) + self:SetScript('OnEnter', UnitFrame_OnEnter) + self:SetScript('OnLeave', UnitFrame_OnLeave) self.ignoreHealComm = true --- print("Spawn", self:GetName(), unit) +-- print('Spawn', self:GetName(), unit) self:EnableMouse(true) self:RegisterForClicks('AnyUp') @@ -1501,25 +1502,68 @@ oUF:Factory(function(self) self:SetActiveStyle('oUF_Lanerra_Group') if (Settings.Units.Party.Healer) then - local group = oUF:SpawnHeader('oUF_Lanerra_Group', nil, 'party', 'showParty', true,'oUF-initialConfigFunction', [[ - local header = self:GetParent() - self:SetWidth(header:GetAttribute("initial-width")) - self:SetHeight(header:GetAttribute("initial-height")) - ]], 'initial-width', 100, 'initial-height', 35, 'columnSpacing', 10, 'unitsPerColumn', 1, 'maxColumns', 5, 'columnAnchorPoint', 'LEFT') + local group = oUF:SpawnHeader( + 'oUF_Lanerra_Group', + nil, + 'party', + 'showParty', true, + 'columnSpacing', 10, + 'unitsPerColumn', 1, + 'maxColumns', 5, + 'columnAnchorPoint', 'LEFT' + ) group:SetPoint('CENTER', UIParent, 0, -240) else - local group = oUF:SpawnHeader('oUF_Lanerra_Group', nil, 'party', 'showParty', true, 'showPlayer', true, 'showFocus', true, 'yOffset', -10) + local group = oUF:SpawnHeader( + 'oUF_Lanerra_Group', + nil, + 'party', + 'showParty', true, + 'showPlayer', true, + 'yOffset', -10 + ) group:SetPoint(unpack(Settings.Units.Party.Position)) end end) -- And finally, the raid stuff +local frameHider = CreateFrame('Frame') +frameHider:Hide() oUF:Factory(function(self) self:SetActiveStyle('oUF_Lanerra_Raid') + + CompactUnitFrameProfiles:UnregisterAllEvents() + CompactRaidFrameManager:SetParent(frameHider) + CompactRaidFrameManager:UnregisterAllEvents() + CompactRaidFrameContainer:SetParent(frameHider) + CompactRaidFrameContainer:UnregisterAllEvents() if (Settings.Units.Raid.Healer) then - raid = oUF:SpawnHeader('oUF_Lanerra_Raid', nil, nil, 'showPlayer', true, 'showRaid', true, 'xOffset', 10, 'yOffset', -5, 'point', 'LEFT', 'groupFilter', '1,2,3,4,5', 'groupingOrder', '1,2,3,4,5', 'groupBy', 'GROUP', 'maxColumns', 10, 'unitsPerColumn', 5, 'columnSpacing', 10, 'columnAnchorPoint', 'TOP') + raid = oUF:SpawnHeader( + 'oUF_Lanerra_Raid', + nil, + 'raid', + 'showPlayer', true, + 'showRaid', true, + --'showSolo', true, + 'xOffset', 10, + 'yOffset', -5, + 'point', 'LEFT', + 'groupFilter', '1,2,3,4,5', + 'groupingOrder', '1,2,3,4,5', + 'groupBy', 'GROUP', + 'maxColumns', 10, + 'unitsPerColumn', 5, + 'columnSpacing', 10, + 'columnAnchorPoint', 'TOP', + 'oUF-initialConfigFunction', [[ + self:SetAttribute('initial-width', 75) + self:SetAttribute('initial-height', 35) + self:SetWidth(75) + self:SetHeight(35) + ]] + ) raid:SetPoint('CENTER', UIParent, 0, -310) if (Settings.Units.Raid.Healer) then @@ -1545,7 +1589,22 @@ oUF:Factory(function(self) else raid = {} for i = 1, 5 do - raid[i] = oUF:SpawnHeader('oUF_Lanerra_Raid'..i, nil, nil, 'groupFilter', i, 'showRaid', true, 'showParty', true, 'showFocus', true, 'yOffset', -10) + raid[i] = oUF:SpawnHeader( + 'oUF_Lanerra_Raid'..i, + nil, + 'raid', + 'groupFilter', '1,2,3,4,5', + 'showRaid', true, + 'showPlayer', true, + --'showSolo', true, + 'yOffset', -10, + 'oUF-initialConfigFunction', [[ + self:SetAttribute('initial-width', 100) + self:SetAttribute('initial-height', 18) + self:SetWidth(100) + self:SetHeight(18) + ]] + ) table.insert(raid, raid[i]) if (i == 1) then raid[i]:SetPoint(unpack(Settings.Units.Raid.Position)) @@ -1555,9 +1614,4 @@ oUF:Factory(function(self) raid[i]:Show() end end -end) - -CompactRaidFrameManager:UnregisterAllEvents() -CompactRaidFrameManager:Hide() -CompactRaidFrameContainer:UnregisterAllEvents() -CompactRaidFrameContainer:Hide() \ No newline at end of file +end) \ No newline at end of file diff --git a/oUF_Lanerra.toc b/oUF_Lanerra.toc index 9df3cb8..1fc3888 100644 --- a/oUF_Lanerra.toc +++ b/oUF_Lanerra.toc @@ -1,5 +1,5 @@ ## Interface: 50400 -## Version: 1.4.1 +## Version: 1.4.2 ## Title: oUF_Lanerra ## Notes: oUF layout by Lanerra -- 1.7.9.5