From 5c8f0ba44ccb3d8b32bfa8d637f6380776b5d267 Mon Sep 17 00:00:00 2001 From: Tek Hudson Date: Fri, 10 Jan 2020 07:21:57 -0800 Subject: [PATCH] Rename xvar and yvar to width and height, remove dontMoveFrame --- DruidBar.lua | 64 +++++++++++++++++++++++++++++++++++----------------------- DruidBar.xml | 4 ++-- Options.lua | 32 ++++++++++++++--------------- 3 files changed, 57 insertions(+), 43 deletions(-) diff --git a/DruidBar.lua b/DruidBar.lua index 951aa76..75b473e 100644 --- a/DruidBar.lua +++ b/DruidBar.lua @@ -150,8 +150,22 @@ function Load_Variables(className) if not DruidBarKey.color then DruidBarKey.color = {0,0,1,1}; end if not DruidBarKey.bordercolor then DruidBarKey.bordercolor = {1,1,1,1}; end if not DruidBarKey.bgcolor then DruidBarKey.bgcolor = {0,0,0,0.5}; end - if(not DruidBarKey.tempW or DruidBarKey.tempW == 0) then DruidBarKey.tempW = DruidBarKey.xvar; end - if(not DruidBarKey.tempH or DruidBarKey.tempH == 0) then DruidBarKey.tempH = DruidBarKey.yvar; end + if(not DruidBarKey.tempW or DruidBarKey.tempW == 0) then + if DruidBarKey.width < 0 then + DruidBarKey.tempW = DruidBarKey.width; + else + DruidBarKey.width = DruidBarKey.xvar; + DruidBarKey.tempW = DruidBarKey.xvar; + end + end + if(not DruidBarKey.tempH or DruidBarKey.tempH == 0) then + if DruidBarKey.height < 0 then + DruidBarKey.tempW = DruidBarKey.height; + else + DruidBarKey.height = DruidBarKey.yvar; + DruidBarKey.tempW = DruidBarKey.yvar; + end + end if(not DruidBarKey.DontShiftBack) then DruidBarKey.DontShiftBack = false; end if not DruidBarKey.bgstrata then DruidBarKey.bgstrata = "BORDER" end if not DruidBarKey.manatexture then DruidBarKey.manatexture = "Interface\\TargetingFrame\\UI-StatusBar"; end @@ -244,29 +258,29 @@ function dbarShow(frame) end function dbarLength() - if not DruidBarKey.xvar then DruidBarKey.xvar = 170; end + if not DruidBarKey.width then DruidBarKey.width = 170; end - if DruidBarFrame:GetWidth() ~= DruidBarKey.xvar then - DruidBarFrame:SetWidth(DruidBarKey.xvar); - DruidBarKey.xvar = DruidBarFrame:GetWidth(); + if DruidBarFrame:GetWidth() ~= DruidBarKey.width then + DruidBarFrame:SetWidth(DruidBarKey.width); + DruidBarKey.width = DruidBarFrame:GetWidth(); end - DruidBarMana:SetWidth(DruidBarKey.xvar*0.95); - DruidBarManaBackground:SetWidth(DruidBarKey.xvar*0.95); - DruidBarDontMove:SetWidth(DruidBarKey.xvar*0.95); + DruidBarMana:SetWidth(DruidBarKey.width*0.95); + DruidBarManaBackground:SetWidth(DruidBarKey.width*0.95); + -- DruidBarDontMove:SetWidth(DruidBarKey.width*0.95); end function dbarHeight() - if not DruidBarKey.yvar then DruidBarKey.yvar = 18; end + if not DruidBarKey.height then DruidBarKey.height = 18; end - if DruidBarFrame:GetHeight() ~= DruidBarKey.yvar then - DruidBarFrame:SetHeight(DruidBarKey.yvar); - DruidBarKey.yvar = DruidBarFrame:GetHeight(); + if DruidBarFrame:GetHeight() ~= DruidBarKey.height then + DruidBarFrame:SetHeight(DruidBarKey.height); + DruidBarKey.height = DruidBarFrame:GetHeight(); end - DruidBarMana:SetHeight(DruidBarKey.yvar*(2/3)); - DruidBarManaBackground:SetHeight(DruidBarKey.yvar*(2/3)); - DruidBarDontMove:SetHeight(DruidBarKey.yvar*(2/3)); + DruidBarMana:SetHeight(DruidBarKey.height*(2/3)); + DruidBarManaBackground:SetHeight(DruidBarKey.height*(2/3)); + -- DruidBarDontMove:SetHeight(DruidBarKey.height*(2/3)); end function Minimap_Button_Renderer() @@ -309,12 +323,12 @@ function DruidBar_MainGraphics() -- Set the position lock and dragability if DruidBarKey.Lock then - dbarShow(DruidBarDontMove); + -- dbarShow(DruidBarDontMove); DruidBarFrame:EnableMouse(0); DruidBarFrame:SetMovable(false) DruidBarFrame:RegisterForDrag() else - dbarHide(DruidBarDontMove); + -- dbarHide(DruidBarDontMove); DruidBarFrame:EnableMouse(1); DruidBarFrame:SetMovable(true) DruidBarFrame:RegisterForDrag("LeftButton") @@ -323,7 +337,7 @@ function DruidBar_MainGraphics() end else dbarHide(DruidBarFrame); - dbarHide(DruidBarDontMove); + -- dbarHide(DruidBarDontMove); end end @@ -331,9 +345,9 @@ function DruidBar_TextRenderer() dbarHide(DruidBarTextLeft); dbarHide(DruidBarTextCenter); dbarHide(DruidBarTextRight); - + -- and MouseIsOver(DruidBarDontMove) -- 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); @@ -385,7 +399,7 @@ function DruidBar_ReplaceGraphics() if UnitPowerType("player") ~= 0 then dbarShow(DruidBarFrame); dbarHide(DruidBarManaBackground); - dbarHide(DruidBarDontMove); + -- dbarHide(DruidBarDontMove); dbarHide(DruidBarBorder); dbarHide(DruidBarTextLeft); dbarHide(DruidBarTextCenter); @@ -578,11 +592,11 @@ function DruidBar_Enable_ChatCommandHandler(text) DruidBarKey.Graphics = DruidBar_Toggle(DruidBarKey.Graphics, "DruidBar's visual data is"); DRUIDBAR_FrameSet(); elseif msg[1] == "width" and msg[2] and tonumber(msg[2]) then - DruidBarKey.xvar = tonumber(msg[2]); + DruidBarKey.width = tonumber(msg[2]); DruidBar_Print("Width is now set to "..msg[2]); DRUIDBAR_FrameSet(); elseif msg[1] == "height" and msg[2] and tonumber(msg[2]) then - DruidBarKey.yvar = tonumber(msg[2]); + DruidBarKey.height = tonumber(msg[2]); DruidBar_Print("Height is now set to "..msg[2]); DRUIDBAR_FrameSet(); elseif msg[1] == "hide" then @@ -602,7 +616,7 @@ function DruidBar_Enable_ChatCommandHandler(text) DRUIDBAR_FrameSet(); elseif msg[1] == "player" then DruidBarKey.Player = DruidBar_Toggle(DruidBarKey.Player, "Showing the bar below the Player Frame is"); - if DruidBarKey.Player then DruidBarKey.xvar = 150; DruidBarKey.yvar = 18; else DruidBarKey.xvar = 170; DruidBarKey.yvar = 18; end + if DruidBarKey.Player then DruidBarKey.width = 150; DruidBarKey.height = 18; else DruidBarKey.width = 170; DruidBarKey.height = 18; end DRUIDBAR_FrameSet(); elseif msg[1] == "text" then if not DruidBarKey.Text then DruidBarKey.Text = 0; DruidBar_Print("Original-Style text on!"); elseif DruidBarKey.Text == 0 then DruidBarKey.Text = 1; DruidBar_Print("New-Style text on!"); elseif DruidBarKey.Text == 1 then DruidBarKey.Text = nil; DruidBar_Print("Text removed."); end diff --git a/DruidBar.xml b/DruidBar.xml index a65c630..0296659 100644 --- a/DruidBar.xml +++ b/DruidBar.xml @@ -115,7 +115,7 @@ -