Mercurial > wow > skeenmelee

changeset 11:f02febfbf809 v1.3.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update
author Emil Madsen <skeen@cs.au.dk>
date Sun, 19 Feb 2012 20:02:54 +0100
parents 01aac1f694d9
children 097c7b03b5d1
files SkeenMelee.lua SkeenMelee.toc
diffstat 2 files changed, 25 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/SkeenMelee.lua	Sun Feb 19 19:29:14 2012 +0100
+++ b/SkeenMelee.lua	Sun Feb 19 20:02:54 2012 +0100
@@ -42,12 +42,6 @@
     if SkeenMeleeDatabase.locked == nil then
         SkeenMeleeDatabase.locked = false --Not locked by default
     end
-    if SkeenMeleeDatabase.x == nil then
-        SkeenMeleeDatabase.x = 100 --TODO: Make some better values I guess?
-    end
-    if SkeenMeleeDatabase.y == nil then
-        SkeenMeleeDatabase.y = 100 --TODO: Make some better values I guess?
-    end
 end
 
 -- Functions Section
@@ -105,20 +99,21 @@
 end
 
 function SkeenMelee:CreateGUI()
-
-    local displayFrame = CreateFrame("Frame", "SkeenMeleeDisplayFrame", UIParent)
+    local displayFrame = CreateFrame("Frame", nil, UIParent)
     displayFrame:SetFrameStrata("BACKGROUND")
+    displayFrame:SetBackdrop({bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", tile = true, tileSize = 32,})
+    displayFrame:SetClampedToScreen(true)
+    displayFrame:SetMovable(true)
+    displayFrame:ClearAllPoints()
     displayFrame:SetWidth(100)
     displayFrame:SetHeight(30)
-    displayFrame:SetBackdrop({bgFile = "Interface\\Tooltips\\UI-Tooltip-Background", tile = true, tileSize = 32,})
-    displayFrame:SetBackdropColor(0, 0, 0, .4)
-    displayFrame:EnableMouse(true)
-    displayFrame:SetMovable(true)
-    displayFrame:SetClampedToScreen(true)
-    displayFrame:SetScript("OnMouseDown", function(self) self:StartMoving() end)
-    displayFrame:SetScript("OnMouseUp", function(self) self:StopMovingOrSizing() end)
-    displayFrame:SetScript("OnDragStop", function(self) self:StopMovingOrSizing() end)
-    displayFrame:SetPoint("CENTER",-200,-200)
+   
+    if SkeenMeleeDatabase.bottom == nil or SkeenMeleeDatabase.left == nil then
+        displayFrame:SetPoint("CENTER")
+        SkeenMeleeDatabase.locked = false
+    else
+        displayFrame:SetPoint("BOTTOMLEFT", SkeenMeleeDatabase.left, SkeenMeleeDatabase.bottom)
+    end
 
     local infoString = displayFrame:CreateFontString("SkeenMelee_infoString","OVERLAY","GameFontNormal")
     infoString:SetText("Unknown")
@@ -155,10 +150,10 @@
     slider2:SetMinMaxValues(.5, 1.5)
     slider2:SetValue(SkeenMelee:GetScale())
     slider2:SetValueStep(.05)
-    slider2:SetScript("OnValueChanged", function(self) SkeenMelee:SetScale(self:GetValue()); getglobal(self:GetName() .. "Text"):SetText(string.format("%.0f%%", self:GetValue()*100))  end)
-    getglobal(slider2:GetName() .. "Low"):SetText("50%")
-    getglobal(slider2:GetName() .. "High"):SetText("150%")
-    getglobal(slider2:GetName() .. "Text"):SetText(string.format("%.0f%%", SkeenMelee:GetScale()*100))
+    --slider2:SetScript("OnValueChanged", function(self) SkeenMelee:SetScale(self:GetValue()); getglobal(self:GetName() .. "Text"):SetText(string.format("%.0f%%", self:GetValue()*100))  end)
+    --getglobal(slider2:GetName() .. "Low"):SetText("50%")
+    --getglobal(slider2:GetName() .. "High"):SetText("150%")
+    --getglobal(slider2:GetName() .. "Text"):SetText(string.format("%.0f%%", SkeenMelee:GetScale()*100))
     slider2:SetPoint("TOPRIGHT", -10, -40)
 
     local fstring3 = panel:CreateFontString("SkeenMeleeOptions_string3","OVERLAY","GameFontNormal")
@@ -169,10 +164,10 @@
     slider3:SetMinMaxValues(0, 1)
     slider3:SetValue(SkeenMelee:GetUpdateInterval())
     slider3:SetValueStep(.1)
-    slider3:SetScript("OnValueChanged", function(self) SkeenMelee:SetUpdateInterval(self:GetValue()); getglobal(self:GetName() .. "Text"):SetText(string.format("%.1f", self:GetValue()))  end)
-    getglobal(slider3:GetName() .. "Low"):SetText("0")
-    getglobal(slider3:GetName() .. "High"):SetText("1")
-    getglobal(slider3:GetName() .. "Text"):SetText(string.format("%.1f", SkeenMelee:GetUpdateInterval()))
+    --slider3:SetScript("OnValueChanged", function(self) SkeenMelee:SetUpdateInterval(self:GetValue()); getglobal(self:GetName() .. "Text"):SetText(string.format("%.1f", self:GetValue()))  end)
+    --getglobal(slider3:GetName() .. "Low"):SetText("0")
+    --getglobal(slider3:GetName() .. "High"):SetText("1")
+    --getglobal(slider3:GetName() .. "Text"):SetText(string.format("%.1f", SkeenMelee:GetUpdateInterval()))
     slider3:SetPoint("TOPRIGHT", -10, -70)
 
     SkeenMelee.options = panel
@@ -207,7 +202,7 @@
     SkeenMeleeDatabase.update_interval = num
 end
 
-function SkeenMelee:UpdateDragability()
+function SkeenMelee:UpdateDragability()    
     if SkeenMeleeDatabase.locked then
         SkeenMelee.displayFrame:SetScript("OnMouseDown", nil)
         SkeenMelee.displayFrame:SetScript("OnMouseUp", nil)
@@ -216,8 +211,8 @@
         SkeenMelee.displayFrame:EnableMouse(false)
     else
         SkeenMelee.displayFrame:SetScript("OnMouseDown", function(self) self:StartMoving() end)
-        SkeenMelee.displayFrame:SetScript("OnMouseUp", function(self) self:StopMovingOrSizing() end)
-        SkeenMelee.displayFrame:SetScript("OnDragStop", function(self) self:StopMovingOrSizing() end)
+        SkeenMelee.displayFrame:SetScript("OnMouseUp", function(self) self:StopMovingOrSizing(); SkeenMeleeDatabase.bottom = SkeenMelee.displayFrame:GetBottom(); SkeenMeleeDatabase.left = SkeenMelee.displayFrame:GetLeft(); end)
+        SkeenMelee.displayFrame:SetScript("OnDragStop", function(self) self:StopMovingOrSizing(); SkeenMeleeDatabase.bottom = SkeenMelee.displayFrame:GetBottom(); SkeenMeleeDatabase.left = SkeenMelee.displayFrame:GetLeft(); end)
         SkeenMelee.displayFrame:SetBackdropColor(0, 0, 0, .4)
         SkeenMelee.displayFrame:EnableMouse(true)
     end
--- a/SkeenMelee.toc	Sun Feb 19 19:29:14 2012 +0100
+++ b/SkeenMelee.toc	Sun Feb 19 20:02:54 2012 +0100
@@ -1,5 +1,5 @@
-## Title: |cffffd200Skeen|r|cff69ccf0Melee|r |cFF00FF001.3.1|r
-## Version: 1.3.1
+## Title: |cffffd200Skeen|r|cff69ccf0Melee|r |cFF00FF001.3.2|r
+## Version: 1.3.2
 ## Author: Skeen
 ## Interface: 40300
 ## SavedVariables: SkeenMeleeDatabase