From fffdeb34624896bcef477be993635017041b44c5 Mon Sep 17 00:00:00 2001
From: Steven Jackson <failcoder@gmail.com>
Date: Thu, 23 Oct 2014 23:47:32 -0500
Subject: [PATCH] 5.1.13

---
 .../AddOns/SVUI/packages/bag/tools/breakstuff.lua  |    6 ++---
 Interface/AddOns/SVUI/system/docks.lua             |   11 ++++-----
 Interface/AddOns/SVUI/xml/framework.xml            |   26 +++++++++++++++-----
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua b/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua
index db5bf53..812e4fd 100644
--- a/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua
+++ b/Interface/AddOns/SVUI/packages/bag/tools/breakstuff.lua
@@ -290,10 +290,10 @@ function MOD:BreakStuffLoader()
 
 	if not allowed then return end
 
-	BreakStuffButton:SetParent(SV.Dock.Right.UtilityBar)
-	local size = SV.Dock.Right.UtilityBar:GetHeight()
+	BreakStuffButton:SetParent(SV.Dock.Right.ToolBar)
+	local size = SV.Dock.Right.ToolBar:GetHeight()
 	BreakStuffButton:Size(size, size)
-	BreakStuffButton:Point("RIGHT", SV.Dock.Right.UtilityBar, "LEFT", -6, 0)
+	BreakStuffButton:Point("RIGHT", SV.Dock.Right.ToolBar, "LEFT", -6, 0)
 	BreakStuffButton:Show();
 	BreakStuffButton:SetFramedButtonTemplate()
 	BreakStuffButton.icon=BreakStuffButton:CreateTexture(nil,"OVERLAY")
diff --git a/Interface/AddOns/SVUI/system/docks.lua b/Interface/AddOns/SVUI/system/docks.lua
index c7bc634..6f74c1a 100644
--- a/Interface/AddOns/SVUI/system/docks.lua
+++ b/Interface/AddOns/SVUI/system/docks.lua
@@ -525,14 +525,11 @@ function Dock:CreateDockPanels()
     self.Left.ToolBar:Point("LEFT", self.Left.Button, "RIGHT", spacing, 0)
     self.Left.ToolBar:Height(buttonsize)
     self.Left.Window:Size(leftWidth, leftHeight - (buttonsize + 4))
-
 	self.Left.Alert.Activate = AlertActivate
 	self.Left.Alert.Deactivate = AlertDeactivate
-
 	self.Left.backdrop = SetSuperDockStyle(self.Left.Window)
 
 	self:ActivateDockletButton(self.Left.Button, ToggleDocks)
-	SV.Mentalo:Add(self.Left, L["Left Dock"])
 
 	-- [[ BOTTOM RIGHT DOCK ]] --
 
@@ -554,15 +551,17 @@ function Dock:CreateDockPanels()
 	self.Right.ToolBar.AddonButton:SetAttribute("tipText", "")
 	self.Right.ToolBar.AddonButton.IsRegistered = false;
 	self.Right.Window:Size(rightWidth, rightHeight - (buttonsize + 4))
-
 	self.Right.Alert.Activate = AlertActivate
 	self.Right.Alert.Deactivate = AlertDeactivate
-
 	self.Right.backdrop = SetSuperDockStyle(self.Right.Window)
 
 	self:ActivateDockletButton(self.Right.Button, SV.ToggleHenchman)
 	self:ActivateDockletButton(self.Right.ToolBar.AddonButton, AddonDockletToggle)
-	SV.Mentalo:Add(self.Right, L["Right Dock"])
+
+	SV.Mentalo:Add(self.Left.BarHolder, L["Left Dock Buttons"])
+	SV.Mentalo:Add(self.Left.Window, L["Left Dock Window"])
+	SV.Mentalo:Add(self.Right.BarHolder, L["Right Dock Buttons"])
+	SV.Mentalo:Add(self.Right.Window, L["Right Dock Window"])
 	SV:AddToDisplayAudit(self.Right.Window)
 
 	if SV.cache.Docks.IsFaded then Dock.Left:Hide() Dock.Right:Hide() end
diff --git a/Interface/AddOns/SVUI/xml/framework.xml b/Interface/AddOns/SVUI/xml/framework.xml
index 15190de..1374f2f 100644
--- a/Interface/AddOns/SVUI/xml/framework.xml
+++ b/Interface/AddOns/SVUI/xml/framework.xml
@@ -35,10 +35,17 @@
             <Anchor point="BOTTOMLEFT" />
         </Anchors>
         <Frames>
+            <Frame name="$parentBarHolder" parentKey="BarHolder">
+                <Size y="22"/>
+                <Anchors>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT" x="0" y="0" />
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="BOTTOMRIGHT" x="0" y="0" />
+                </Anchors>
+            </Frame>
             <Button name="$parentButton" parentKey="Button">
                 <Size x="22" y="22"/>
                 <Anchors>
-                    <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" />
+                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT" />
                 </Anchors>
                 <Attributes>
                     <Attribute name="tipText" type="string" value="" />
@@ -67,8 +74,8 @@
             <Frame name="$parentAlert" parentKey="Alert" frameStrata="BACKGROUND">
                 <Size y="1"/>
                 <Anchors>
-                    <Anchor point="BOTTOMLEFT" relativeTo="$parentButton" relativePoint="TOPLEFT" x="0" y="4" />
-                    <Anchor point="BOTTOMRIGHT" relativeTo="$parentToolBar" relativePoint="TOPRIGHT" x="0" y="4" />
+                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="TOPLEFT" x="0" y="4" />
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT" x="0" y="4" />
                 </Anchors>
             </Frame>
             <Frame name="$parentWindow" parentKey="Window" frameStrata="BACKGROUND">
@@ -89,10 +96,17 @@
             <Anchor point="BOTTOMRIGHT" />
         </Anchors>
         <Frames>
+            <Frame name="$parentBarHolder" parentKey="BarHolder">
+                <Size y="22"/>
+                <Anchors>
+                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT" x="0" y="0" />
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="BOTTOMRIGHT" x="0" y="0" />
+                </Anchors>
+            </Frame>
             <Button name="$parentButton" parentKey="Button">
                 <Size x="22" y="22"/>
                 <Anchors>
-                    <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" />
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="BOTTOMRIGHT" />
                 </Anchors>
                 <Attributes>
                     <Attribute name="tipText" type="string" value="" />
@@ -145,8 +159,8 @@
             <Frame name="$parentAlert" parentKey="Alert" frameStrata="BACKGROUND">
                 <Size y="1"/>
                 <Anchors>
-                    <Anchor point="BOTTOMRIGHT" relativeTo="$parentButton" relativePoint="TOPRIGHT" x="0" y="4" />
-                    <Anchor point="BOTTOMLEFT" relativeTo="$parentToolBar" relativePoint="TOPLEFT" x="0" y="4" />
+                    <Anchor point="BOTTOMRIGHT" relativeTo="$parent" relativePoint="TOPRIGHT" x="0" y="4" />
+                    <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="TOPLEFT" x="0" y="4" />
                 </Anchors>
             </Frame>
             <Frame name="$parentWindow" parentKey="Window" frameStrata="BACKGROUND">
-- 
1.7.9.5