From 1cca159c1f1ae1164b98104003b8b21b0097d33b Mon Sep 17 00:00:00 2001
From: Tek Hudson <tek.hudson@gmail.com>
Date: Fri, 10 Jan 2020 07:58:54 -0800
Subject: [PATCH 1/2] Bar is resetting due to set movablew removing data from
 player's layout-local

---
 DruidBar.lua |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/DruidBar.lua b/DruidBar.lua
index b4f815e..0440b08 100644
--- a/DruidBar.lua
+++ b/DruidBar.lua
@@ -329,15 +329,13 @@ function DruidBar_MainGraphics()
 		if DruidBarKey.Lock then
 			dbarShow(DruidBarDontMove);
 			DruidBarFrame:EnableMouse(0);
-			DruidBarFrame:SetMovable(false)
-			DruidBarFrame:RegisterForDrag()
+			DruidBarFrame:RegisterForDrag();
 		else
 			dbarHide(DruidBarDontMove);
 			DruidBarFrame:EnableMouse(1);
-			DruidBarFrame:SetMovable(true)
-			DruidBarFrame:RegisterForDrag("LeftButton")
-			DruidBarFrame:SetScript("OnDragStart", DruidBarFrame.StartMoving)
-			DruidBarFrame:SetScript("OnDragStop", DruidBarFrame.StopMovingOrSizing)
+			DruidBarFrame:RegisterForDrag("LeftButton");
+			DruidBarFrame:SetScript("OnDragStart", DruidBarFrame.StartMoving);
+			DruidBarFrame:SetScript("OnDragStop", DruidBarFrame.StopMovingOrSizing);
 		end
 	else
 		dbarHide(DruidBarFrame);
-- 
1.7.9.5


From 40b4898304526f495c8b717676ab07fa0b89f421 Mon Sep 17 00:00:00 2001
From: Tek Hudson <tek.hudson@gmail.com>
Date: Fri, 10 Jan 2020 08:00:31 -0800
Subject: [PATCH 2/2] Remove deprecated DruidBarDontMove

---
 DruidBar.lua |    8 +-------
 DruidBar.xml |   14 --------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/DruidBar.lua b/DruidBar.lua
index 0440b08..637a67c 100644
--- a/DruidBar.lua
+++ b/DruidBar.lua
@@ -271,7 +271,6 @@ function dbarLength()
 
 	DruidBarMana:SetWidth(DruidBarKey.width*0.95);
 	DruidBarManaBackground:SetWidth(DruidBarKey.width*0.95);
-	DruidBarDontMove:SetWidth(DruidBarKey.width*0.95);
 end
 
 function dbarHeight()
@@ -284,7 +283,6 @@ function dbarHeight()
 
 	DruidBarMana:SetHeight(DruidBarKey.height*(2/3));
 	DruidBarManaBackground:SetHeight(DruidBarKey.height*(2/3));
-	DruidBarDontMove:SetHeight(DruidBarKey.height*(2/3));
 end
 
 function Minimap_Button_Renderer()
@@ -327,11 +325,9 @@ function DruidBar_MainGraphics()
 
 		-- Set the position lock and dragability
 		if DruidBarKey.Lock then
-			dbarShow(DruidBarDontMove);
 			DruidBarFrame:EnableMouse(0);
 			DruidBarFrame:RegisterForDrag();
 		else
-			dbarHide(DruidBarDontMove);
 			DruidBarFrame:EnableMouse(1);
 			DruidBarFrame:RegisterForDrag("LeftButton");
 			DruidBarFrame:SetScript("OnDragStart", DruidBarFrame.StartMoving);
@@ -339,7 +335,6 @@ function DruidBar_MainGraphics()
 		end
 	else
 		dbarHide(DruidBarFrame);
-		dbarHide(DruidBarDontMove);
 	end
 end
 
@@ -349,7 +344,7 @@ function DruidBar_TextRenderer()
 	dbarHide(DruidBarTextRight);
 
 	-- Text options --
-	if DruidBarKey.Text or (not DruidBarKey.Text and MouseIsOver(DruidBarDontMove)) then
+	if DruidBarKey.Text or (not DruidBarKey.Text) then
 		if DruidBarKey.Percent then
 			if DruidBarKey.Percent == 0 then -- Numbers
 				dbarShow(DruidBarTextCenter);
@@ -405,7 +400,6 @@ function DruidBar_ReplaceGraphics()
 	if UnitPowerType("player") ~= 0 then
 		dbarShow(DruidBarFrame);
 		dbarHide(DruidBarManaBackground);
-		dbarHide(DruidBarDontMove);
 		dbarHide(DruidBarBorder);
 		dbarHide(DruidBarTextLeft);
 		dbarHide(DruidBarTextCenter);
diff --git a/DruidBar.xml b/DruidBar.xml
index a908f6a..514828a 100644
--- a/DruidBar.xml
+++ b/DruidBar.xml
@@ -115,20 +115,6 @@
 		</Scripts>
 	</Frame>
 
-	<Button name="DruidBarDontMove" frameStrata="TOOLTIP" toplevel="true" parent="DruidBarFrame" enableMouse="false" movable="false" hidden="true">
-		<Size>
-			<AbsDimension x="170" y="18"/>
-		</Size>
-
-		<Anchors>
-			<Anchor point="CENTER" relativeTo="$parent" relativePoint="CENTER">
-				<Offset>
-					<AbsDimension x="0" y="0"/>
-				</Offset>
-			</Anchor>
-		</Anchors>
-	</Button>
-
 	<Frame name="DruidBarReplaceText" frameStrata="LOW" enableMouse="true" movable="false" parent="UIParent" hidden="true">
 		<Size>
 			<AbsDimension x="120" y="10"/>
-- 
1.7.9.5