Quantcast

5.2.04

Steven Jackson [11-16-14 - 08:36]
5.2.04
Filename
Interface/AddOns/SVUI/framework/docks/docks.lua
Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua
Interface/AddOns/SVUI/packages/bag/SVBag.lua
Interface/AddOns/SVUI/packages/map/SVMap.lua
Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua
Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua
diff --git a/Interface/AddOns/SVUI/framework/docks/docks.lua b/Interface/AddOns/SVUI/framework/docks/docks.lua
index 54e203d..1e8b865 100644
--- a/Interface/AddOns/SVUI/framework/docks/docks.lua
+++ b/Interface/AddOns/SVUI/framework/docks/docks.lua
@@ -477,10 +477,7 @@ local RefreshBarLayout = function(self)
 	local mod = self.Data.Modifier
 	local size = self.ToolBar:GetHeight();
 	local count = #self.Data.Order;
-	local width = count * (size + 6) + 6;
 	local offset = 1;
-
-	self.ToolBar:SetWidth(width);
 	local safeIndex = 1;
 	for i = 1, count do
 		local nextName = self.Data.Order[i];
@@ -498,6 +495,8 @@ local RefreshBarLayout = function(self)
 		end
 	end

+	self.ToolBar:SetWidth(offset + size);
+
 	if(SV.Dropdown:IsShown()) then
 		ToggleFrame(SV.Dropdown)
 	end
@@ -537,7 +536,7 @@ local AddToDock = function(self, button)
 		button.FrameLink:FillInner(self.Parent.Window)
 	end

-	self:UpdateOrder()
+	-- self:UpdateOrder()
 	self:Update()
 end

diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua
index cc4c8d9..70d87c4 100644
--- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua
+++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_MonkHarmony/oUF_MonkHarmony.lua
@@ -33,10 +33,13 @@ local function Update(self, event, unit)
 	local numPoints = UnitPowerMax("player", SPELL_POWER_CHI)

 	for i = 1, numPoints do
-		if i <= light then
-			hb[i]:Show()
-		else
-			hb[i]:Hide()
+		local orb = hb[i]
+		if(orb) then
+			if i <= light then
+				orb:Show()
+			else
+				orb:Hide()
+			end
 		end
 	end

diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua
index d3c9dc7..58308b9 100644
--- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua
+++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua
@@ -350,7 +350,10 @@ local SlotUpdate = function(self, slotID)
 		slot:SetBackdropBorderColor(r, g, b, 1)
 	end

-	ActionButton_HideOverlayGlow(slot)
+	--ActionButton_HideOverlayGlow(slot)
+	if(slot.NewItemTexture) then
+		slot.NewItemTexture:Hide()
+	end

 	SetItemButtonTexture(slot, texture)
 	SetItemButtonCount(slot, count)
diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua
index 51f1b51..382fd59 100644
--- a/Interface/AddOns/SVUI/packages/map/SVMap.lua
+++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua
@@ -720,6 +720,26 @@ function MOD:PLAYER_REGEN_DISABLED()
 	WorldMapFrameSizeDownButton:Disable()
 	WorldMapFrameSizeUpButton:Disable()
 end
+
+local function CreateGarrisonDock()
+	local garrison = SV.Dock:SetDockButton("TopLeft", L["Garrison"], GARRISON_ICON, nil, "SVUI_Garrison", SetGarrisonTooltip, "SecureActionButtonTemplate")
+	garrison:SetAttribute("type1", "click")
+	garrison:SetAttribute("clickbutton", GarrisonLandingPageMinimapButton)
+
+	local garrisonStone = GetItemInfo(110560);
+	if(garrisonStone and type(garrisonStone) == "string") then
+		garrison:SetAttribute("tipExtraText", L["Garrison Hearthstone"])
+		garrison:SetAttribute("type2", "macro")
+		garrison:SetAttribute("macrotext", "/use [nomod] " .. garrisonStone)
+	end
+
+	GarrisonLandingPageMinimapButton:RemoveTextures()
+	GarrisonLandingPageMinimapButton:ClearAllPoints()
+	GarrisonLandingPageMinimapButton:SetAllPoints(garrison)
+	GarrisonLandingPageMinimapButton:SetNormalTexture("")
+	GarrisonLandingPageMinimapButton:SetPushedTexture("")
+	GarrisonLandingPageMinimapButton:SetHighlightTexture("")
+end
 --[[
 ##########################################################
 BUILD FUNCTION / UPDATE
@@ -845,15 +865,7 @@ function MOD:Load()
 		garrison:SetAttribute("macrotext", "/use [nomod] " .. garrisonStone)
 	end

-	GarrisonLandingPageMinimapButton:RemoveTextures()
-	GarrisonLandingPageMinimapButton:ClearAllPoints()
-	GarrisonLandingPageMinimapButton:SetAllPoints(garrison)
-	GarrisonLandingPageMinimapButton:SetNormalTexture("")
-	GarrisonLandingPageMinimapButton:SetPushedTexture("")
-	GarrisonLandingPageMinimapButton:SetHighlightTexture("")
-
-	GarrisonLandingPageMinimapButton:HookScript("OnShow", function() SV.Dock.TopLeft.Bar:Add(SVUI_Garrison) end)
-	GarrisonLandingPageMinimapButton:HookScript("OnHide", function() SV.Dock.TopLeft.Bar:Remove(SVUI_Garrison) end)
+	GarrisonLandingPageMinimapButton:HookScript("OnShow", CreateGarrisonDock)

 	if FeedbackUIButton then
 		FeedbackUIButton:Die()
diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
index 31ffea8..1f629b2 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua
@@ -309,43 +309,39 @@ function PLUGIN:RegisterAddonDocklets()
 			self.Docklet.Dock1:SetWidth(width)
 		end

-		while(not self.Docklet.Dock1.FrameLink) do
-			if(self:DockletReady("Skada", dock1)) then
-				tipLeft = "Skada";
-				self:Docklet_Skada()
-			elseif(self:DockletReady("Omen", dock1)) then
-				tipLeft = "Omen";
-				self:Docklet_Omen(self.Docklet.Dock1)
-			elseif(self:DockletReady("Recount", dock1)) then
-				tipLeft = "Recount";
-				self:Docklet_Recount(self.Docklet.Dock1)
-			elseif(self:DockletReady("TinyDPS", dock1)) then
-				tipLeft = "TinyDPS";
-				self:Docklet_TinyDPS(self.Docklet.Dock1)
-			elseif(self:DockletReady("alDamageMeter", dock1)) then
-				tipLeft = "alDamageMeter";
-				self:Docklet_alDamageMeter(self.Docklet.Dock1)
-			end
+		if(self:DockletReady("Skada", dock1)) then
+			tipLeft = "Skada";
+			self:Docklet_Skada()
+		elseif(self:DockletReady("Omen", dock1)) then
+			tipLeft = "Omen";
+			self:Docklet_Omen(self.Docklet.Dock1)
+		elseif(self:DockletReady("Recount", dock1)) then
+			tipLeft = "Recount";
+			self:Docklet_Recount(self.Docklet.Dock1)
+		elseif(self:DockletReady("TinyDPS", dock1)) then
+			tipLeft = "TinyDPS";
+			self:Docklet_TinyDPS(self.Docklet.Dock1)
+		elseif(self:DockletReady("alDamageMeter", dock1)) then
+			tipLeft = "alDamageMeter";
+			self:Docklet_alDamageMeter(self.Docklet.Dock1)
 		end

 		if(enabled2) then
-			while(not self.Docklet.Dock2.FrameLink) do
-				if(self:DockletReady("Skada", dock2)) then
-					tipRight = "and Skada";
-					self:Docklet_Skada()
-				elseif(self:DockletReady("Omen", dock2)) then
-					tipRight = "and Omen";
-					self:Docklet_Omen(self.Docklet.Dock2)
-				elseif(self:DockletReady("Recount", dock2)) then
-					tipRight = "and Recount";
-					self:Docklet_Recount(self.Docklet.Dock2)
-				elseif(self:DockletReady("TinyDPS", dock2)) then
-					tipRight = "and TinyDPS";
-					self:Docklet_TinyDPS(self.Docklet.Dock2)
-				elseif(self:DockletReady("alDamageMeter", dock2)) then
-					tipRight = "and alDamageMeter";
-					self:Docklet_alDamageMeter(self.Docklet.Dock2)
-				end
+			if(self:DockletReady("Skada", dock2)) then
+				tipRight = "and Skada";
+				self:Docklet_Skada()
+			elseif(self:DockletReady("Omen", dock2)) then
+				tipRight = "and Omen";
+				self:Docklet_Omen(self.Docklet.Dock2)
+			elseif(self:DockletReady("Recount", dock2)) then
+				tipRight = "and Recount";
+				self:Docklet_Recount(self.Docklet.Dock2)
+			elseif(self:DockletReady("TinyDPS", dock2)) then
+				tipRight = "and TinyDPS";
+				self:Docklet_TinyDPS(self.Docklet.Dock2)
+			elseif(self:DockletReady("alDamageMeter", dock2)) then
+				tipRight = "and alDamageMeter";
+				self:Docklet_alDamageMeter(self.Docklet.Dock2)
 			end
 		end

diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua
index 3e5b3b6..94b616f 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua
@@ -84,6 +84,7 @@ function PLUGIN:Docklet_Omen(parent)
   OmenAnchor:SetFixedPanelTemplate('Transparent')
   OmenAnchor:ClearAllPoints()
   OmenAnchor:SetAllPoints(parent)
+  OmenAnchor:SetParent(parent)

   parent.Framelink = OmenAnchor
 end
\ No newline at end of file
diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua
index 56dd68c..8b3eb95 100644
--- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua
+++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua
@@ -133,6 +133,7 @@ function PLUGIN:Docklet_Recount(parent)
   Recount.db.profile.FrameStrata='2-LOW'
   Recount.MainWindow:ClearAllPoints()
   Recount.MainWindow:SetAllPoints(parent)
+  Recount.MainWindow:SetParent(parent)
   Recount:SetStrataAndClamp()
   Recount:LockWindows(true)
   Recount:ResizeMainWindow()