diff --git a/IceBarElement.lua b/IceBarElement.lua index 6c645df..621eae7 100644 --- a/IceBarElement.lua +++ b/IceBarElement.lua @@ -599,7 +599,7 @@ function IceBarElement.prototype:CreateBackground() self.frame.bg = self.frame:CreateTexture(nil, "BACKGROUND") end - self.frame.bg:SetTexture(IceElement.TexturePath .. self:GetMyBarTexture() .."BG") + self.frame.bg:SetTexture(IceElement.TexturePath .. "RivetBarBG")--self:GetMyBarTexture() .."BG") self.frame.bg:SetBlendMode(self.settings.barBgBlendMode) self.frame.bg:ClearAllPoints() self.frame.bg:SetAllPoints(self.frame) @@ -610,7 +610,7 @@ function IceBarElement.prototype:CreateBackground() self.frame.bg:SetTexCoord(0, 1, 0, 1) end - self.frame:SetStatusBarTexture(self.frame.bg) + --self.frame:SetStatusBarTexture(self.frame.bg) self.frame:SetStatusBarColor(self:GetColor("undef", self.settings.alphabg)) local ownPoint = "LEFT" @@ -642,10 +642,12 @@ function IceBarElement.prototype:CreateBar() if not (self.barFrame.bar) then - self.barFrame.bar = self.frame:CreateTexture(nil, "BACKGROUND") + self.barFrame.bar = self.frame:CreateTexture(nil, "LOW") + --self.barFrame.bar:SetHorizTile(true) + --self.barFrame.bar:SetVertTile(true) end - self.barFrame.bar:SetTexture(IceElement.TexturePath .. self:GetMyBarTexture()) + self.barFrame.bar:SetTexture(IceElement.TexturePath .. "RivetBar")--self:GetMyBarTexture()) self.barFrame.bar:SetBlendMode(self.settings.barBlendMode) self.barFrame.bar:SetAllPoints(self.barFrame) @@ -654,13 +656,15 @@ function IceBarElement.prototype:CreateBar() else self.barFrame.bar:SetTexCoord(0, 1, 1-self.CurrScale, 1) end - - self.barFrame:SetStatusBarTexture(self.barFrame.bar) + + --self.barFrame:SetStatusBarTexture(self.barFrame.bar) self:UpdateBar(1, "undef") self.barFrame:ClearAllPoints() self.barFrame:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, 0) + + --self.barFrame.bar:SetPoint("BOTTOM", self.barFrame, "BOTTOM", 0, 0) end @@ -777,12 +781,14 @@ function IceBarElement.prototype:SetScale(texture, scale) max_y = 1; end end - +--[[ if (self.moduleSettings.side == IceCore.Side.Left) then texture:SetTexCoord(1, 0, min_y, max_y) else texture:SetTexCoord(0, 1, min_y, max_y) end +]]-- + self.barFrame:SetHeight(self.settings.barHeight * self.CurrScale) end end @@ -837,7 +843,8 @@ function IceBarElement.prototype:UpdateBar(scale, color, alpha) end self.frame:SetStatusBarColor(r, g, b, self.backgroundAlpha) - self.barFrame:SetStatusBarColor(self:GetColor(color)) + --self.barFrame:SetStatusBarColor(self:GetColor(color)) + self.barFrame.bar:SetVertexColor(self:GetColor(color)) if self.DesiredScale ~= scale then self.DesiredScale = scale diff --git a/IceHUD.lua b/IceHUD.lua index 8914d90..2fd639d 100644 --- a/IceHUD.lua +++ b/IceHUD.lua @@ -324,6 +324,7 @@ IceHUD.options = IceHUD.IceCore:SetBarPreset(value) end, validate = IceHUD.validBarList, + disabled = true, order = 9 }, @@ -346,6 +347,7 @@ IceHUD.options = IceHUD.IceCore:SetBarTexture(value) end, validate = IceHUD.validBarList, + disabled = true, order = 11 }, diff --git a/modules/CastBar.lua b/modules/CastBar.lua index b79be64..8cf1af3 100644 --- a/modules/CastBar.lua +++ b/modules/CastBar.lua @@ -446,7 +446,7 @@ function CastBar.prototype:SpellCastStart(unit, spell, rank) pos = 0 end local y = self.settings.barHeight - (pos * self.settings.barHeight) - +--[[ if (self.moduleSettings.side == IceCore.Side.Left) then self.lagBar.bar:SetTexCoord(1, 0, 0, pos) else @@ -454,6 +454,7 @@ function CastBar.prototype:SpellCastStart(unit, spell, rank) end self.lagBar:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, y) +]]-- end @@ -473,7 +474,7 @@ function CastBar.prototype:SpellCastChannelStart(unit) pos = 0 end local y = self.settings.barHeight - (pos * self.settings.barHeight) - +--[[ if (self.moduleSettings.side == IceCore.Side.Left) then self.lagBar.bar:SetTexCoord(1, 0, 1-pos, 1) else @@ -481,6 +482,7 @@ function CastBar.prototype:SpellCastChannelStart(unit) end self.lagBar:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, 0) +]]-- end diff --git a/modules/CustomBar.lua b/modules/CustomBar.lua index 0162091..9c0807f 100644 --- a/modules/CustomBar.lua +++ b/modules/CustomBar.lua @@ -354,7 +354,8 @@ function IceCustomBar.prototype:UpdateCustomBar(unit, fromUpdate) self:SetBottomText1(self.moduleSettings.upperText) end - self.barFrame:SetStatusBarColor(self:GetBarColor()) + --self.barFrame:SetStatusBarColor(self:GetBarColor()) + self.barFrame.bar:SetVertexColor(self:GetBarColor()) end function IceCustomBar.prototype:OutCombat() diff --git a/modules/CustomCDBar.lua b/modules/CustomCDBar.lua index 7c15339..887cc7b 100644 --- a/modules/CustomCDBar.lua +++ b/modules/CustomCDBar.lua @@ -276,7 +276,8 @@ function IceCustomCDBar.prototype:UpdateCustomBar(fromUpdate) self:SetBottomText1(self.moduleSettings.upperText) end - self.barFrame:SetStatusBarColor(self:GetBarColor()) + --self.barFrame:SetStatusBarColor(self:GetBarColor()) + self.barFrame.bar:SetVertexColor(self:GetBarColor()) end function IceCustomCDBar.prototype:OutCombat() diff --git a/modules/Threat.lua b/modules/Threat.lua index aef7b16..d2dd393 100644 --- a/modules/Threat.lua +++ b/modules/Threat.lua @@ -288,7 +288,7 @@ function IceThreat.prototype:Update(unit) -- set the bar value self:UpdateBar( scaledPercentZeroToOne, self.color ) - +--[[ -- do the aggro indicator bar stuff, but only if it has changed if ( self.aggroBarMulti ~= rangeMulti ) then self.aggroBarMulti = rangeMulti @@ -304,7 +304,7 @@ function IceThreat.prototype:Update(unit) self.aggroBar:SetPoint("BOTTOM", self.frame, "BOTTOM", 0, y) end - +]]-- self:UpdateAlpha() end