diff --git a/IceBarElement.lua b/IceBarElement.lua index 2a1adac..b595b59 100644 --- a/IceBarElement.lua +++ b/IceBarElement.lua @@ -38,6 +38,7 @@ function IceBarElement.prototype:GetDefaultSettings() settings["side"] = IceCore.Side.Left settings["offset"] = 1 + settings["scale"] = 1 settings["barFontSize"] = 12 settings["lockTextAlpha"] = true settings["textVisible"] = {upper = true, lower = true} @@ -99,6 +100,28 @@ function IceBarElement.prototype:GetOptions() order = 31 } + opts["scale"] = + { + type = 'range', + name = '|c' .. self.configColor .. 'Scale|r', + desc = 'Scale of the bar', + min = 0.1, + max = 2, + step = 0.05, + isPercent = true, + get = function() + return self.moduleSettings.scale + end, + set = function(value) + self.moduleSettings.scale = value + self:Redraw() + end, + disabled = function() + return not self.moduleSettings.enabled + end, + order = 32 + } + opts["textSettings"] = { type = 'group', diff --git a/IceCore.lua b/IceCore.lua index 2bf0edc..783154d 100644 --- a/IceCore.lua +++ b/IceCore.lua @@ -38,6 +38,7 @@ function IceCore.prototype:init() local defaults = { gap = 150, verticalPos = -110, + horizontalPos = 0, scale = 0.9, alphaooc = 0.3, @@ -117,7 +118,7 @@ function IceCore.prototype:DrawFrame() self:SetScale(self.settings.scale) - self.IceHUDFrame:SetPoint("CENTER", 0, self.settings.verticalPos) + self.IceHUDFrame:SetPoint("CENTER", self.settings.horizontalPos, self.settings.verticalPos) self.IceHUDFrame:Show() end @@ -196,7 +197,16 @@ end function IceCore.prototype:SetVerticalPos(value) self.settings.verticalPos = value self.IceHUDFrame:ClearAllPoints() - self.IceHUDFrame:SetPoint("CENTER", 0, self.settings.verticalPos) + self.IceHUDFrame:SetPoint("CENTER", self.settings.horizontalPos, self.settings.verticalPos) +end + +function IceCore.prototype:GetHorizontalPos() + return self.settings.horizontalPos +end +function IceCore.prototype:SetHorizontalPos(value) + self.settings.horizontalPos = value + self.IceHUDFrame:ClearAllPoints() + self.IceHUDFrame:SetPoint("CENTER", self.settings.horizontalPos, self.settings.verticalPos) end diff --git a/IceHUD.lua b/IceHUD.lua index 50a3e26..71e23f5 100644 --- a/IceHUD.lua +++ b/IceHUD.lua @@ -31,12 +31,28 @@ IceHUD.options = set = function(v) IceHUD.IceCore:SetVerticalPos(v) end, - min = -200, - max = 200, + min = -400, + max = 400, step = 10, order = 11 }, + hpos = { + type = 'range', + name = 'Horizontal position', + desc = 'Horizontal position (for you dual screen freaks)', + get = function() + return IceHUD.IceCore:GetHorizontalPos() + end, + set = function(v) + IceHUD.IceCore:SetHorizontalPos(v) + end, + min = -2000, + max = 2000, + step = 10, + order = 12 + }, + gap = { type = 'range', name = 'Gap', @@ -50,7 +66,7 @@ IceHUD.options = min = 50, max = 300, step = 5, - order = 12, + order = 13, }, scale = { @@ -67,7 +83,7 @@ IceHUD.options = max = 1.5, step = 0.05, isPercent = true, - order = 13, + order = 14, }, } }, diff --git a/IceHUD.toc b/IceHUD.toc index 84c310c..0c3f3a4 100644 --- a/IceHUD.toc +++ b/IceHUD.toc @@ -3,7 +3,7 @@ ## Name: IceHUD ## Title: IceHUD |cff7fff7f -Ace2-|r ## Notes: Another HUD addon -## Version: 0.9.3 ($Revision$) +## Version: 0.9.4 ($Revision$) ## SavedVariables: IceCoreDB ## OptionalDeps: Ace2, GratuityLib, SharedMediaLib, WaterfallLib, MobHealth ## X-Embeds: Ace2, GratuityLib, SharedMediaLib, WaterfallLib diff --git a/modules/ComboPoints.lua b/modules/ComboPoints.lua index 6f58989..565e492 100644 --- a/modules/ComboPoints.lua +++ b/modules/ComboPoints.lua @@ -184,7 +184,7 @@ function ComboPoints.prototype:CreateComboFrame() -- create combo points for i = 1, 5 do if (not self.frame.graphical[i]) then - self.frame.graphical[i] = CreateFrame("StatusBar", nil, self.frame.graphicalBG[i]) + self.frame.graphical[i] = CreateFrame("StatusBar", nil, self.frame) self.frame.graphical[i]:SetStatusBarTexture(IceElement.TexturePath .. "Combo") end self.frame.graphical[i]:SetFrameStrata("BACKGROUND")