diff --git a/core/PSBT_Label.lua b/core/PSBT_Label.lua
index f450858..ce0b89c 100644
--- a/core/PSBT_Label.lua
+++ b/core/PSBT_Label.lua
@@ -70,15 +70,15 @@ function PSBT_Label:SetIconPosition( side )
self.iconPos = side
if ( side ~= PSBT_ICON_SIDE.NONE ) then
- local textWidth, textHeight = self.label:GetTextDimensions()
- self.icon:SetWidth( textHeight )
- self.icon:SetHeight( textHeight )
+ local height = self:GetHeight()
+ self.icon:SetWidth( height )
+ self.icon:SetHeight( height )
local xpos = 0
if ( side == PSBT_ICON_SIDE.LEFT ) then
- xpos = ( textWidth * -0.5 ) - self.icon:GetWidth()
+ xpos = ( self:GetWidth() * -0.5 ) - self.icon:GetWidth()
else
- xpos = ( textWidth * 0.5 ) + self.icon:GetWidth()
+ xpos = ( self:GetWidth() * 0.5 ) + self.icon:GetWidth()
end
self.icon:SetAnchor( CENTER, self.control, CENTER, xpos, 0 )
@@ -94,4 +94,14 @@ function PSBT_Label:SetTexture( texture )
else
self.icon:SetHidden( true )
end
+end
+
+function PSBT_Label:GetWidth()
+ local textWidth = self.label:GetTextDimensions()
+ return textWidth
+end
+
+function PSBT_Label:GetHeight()
+ local _, textHeight = self.label:GetTextDimensions()
+ return textHeight
end
\ No newline at end of file
diff --git a/core/PSBT_ScrollArea.lua b/core/PSBT_ScrollArea.lua
index eecc9b4..3e4ce1d 100644
--- a/core/PSBT_ScrollArea.lua
+++ b/core/PSBT_ScrollArea.lua
@@ -130,6 +130,7 @@ function PSBT_ScrollArea:OnUpdate( frameTime )
end
anim:TranslateTo( 0, ypos, 200 )
+ anim:ScaleTo( 0.5, 200 )
anim:Play()
entry:SetMoving( false )
@@ -144,7 +145,10 @@ function PSBT_ScrollArea:OnUpdate( frameTime )
if ( newEntry ) then
newEntry:SetExpire( frameTime + 5 )
+ newEntry.control:SetScale( 0.5 )
+
local anim = LibAnim:New( newEntry.control )
+ anim:ScaleTo( 1.0, 200 )
anim:AlphaTo( 1.0, 200 )
anim:Play()
@@ -157,8 +161,11 @@ function PSBT_ScrollArea:OnUpdate( frameTime )
if ( newEntry ) then
newEntry:SetExpire( frameTime + 5 )
+ newEntry.control:SetScale( 0.5 )
+
local anim = LibAnim:New( newEntry.control )
anim:AlphaTo( 1.0, 200 )
+ anim:ScaleTo( 1.0, 200 )
anim:Play()
self._sticky:Push( newEntry )
@@ -170,9 +177,9 @@ function PSBT_ScrollArea:OnUpdate( frameTime )
while ( i <= #self._normal ) do
local entry = self._normal[ i ]
- if ( entry:WillExpire( frameTime + 2 ) ) then
+ if ( entry:WillExpire( frameTime + 3 ) ) then
local anim = LibAnim:New( entry.control )
- anim:AlphaTo( 0.0, 200 )
+ anim:AlphaTo( 0.0, 300, nil, nil, ZO_EaseInOutQuadratic )
anim:Play()
entry:SetMoving( false )
@@ -190,7 +197,7 @@ function PSBT_ScrollArea:OnUpdate( frameTime )
end
- anim:TranslateTo( 0, targetY, 3000 )
+ anim:TranslateTo( 0, targetY, 3000, nil, nil, ZO_EaseInOutQuadratic )
anim:Play()
entry:SetMoving( true )
@@ -208,7 +215,7 @@ function PSBT_ScrollArea:OnUpdate( frameTime )
entry:SetMoving( true )
- top = top + entry.control:GetHeight()
+ top = top + entry:GetHeight()
end
end
diff --git a/modules/PSBT_Combat.lua b/modules/PSBT_Combat.lua
index 581d34e..1b77899 100644
--- a/modules/PSBT_Combat.lua
+++ b/modules/PSBT_Combat.lua
@@ -266,9 +266,9 @@ local combat_events =
return zo_strformat( '+<<1>> (<<2>>)', hitValue, mechanicName ), PSBT_AREAS.INCOMING, false
end,
- [ ACTION_RESULT_BAD_TARGET ] = function( ... )
+ --[[[ ACTION_RESULT_BAD_TARGET ] = function( ... )
return 'Bad Target', PSBT_AREAS.STATIC, true
- end,
+ end,]]
[ ACTION_RESULT_CANNOT_USE ] = function( ... )
return 'Cannot Use', PSBT_AREAS.STATIC, true
diff --git a/modules/PSBT_LowSomething.lua b/modules/PSBT_LowSomething.lua
index 2d24ce3..c15594a 100644
--- a/modules/PSBT_LowSomething.lua
+++ b/modules/PSBT_LowSomething.lua
@@ -54,13 +54,13 @@ function PSBT_LowSomething:OnPowerUpdate( unit, powerPoolIndex, powerType, power
local string = nil
if ( powerType == POWERTYPE_HEALTH ) then
- string = 'Health Low! (|cF2920C' .. powerPool .. '|r)'
+ string = 'Health Low! (|cD8594B' .. powerPool .. '|r)'
elseif ( powerType == POWERTYPE_MAGICKA ) then
- string = 'Magicka Low! (|cCC0CF2' .. powerPool .. '|r)'
+ string = 'Magicka Low! (|c92CEF8' .. powerPool .. '|r)'
elseif ( powerType == POWERTYPE_STAMINA ) then
- string = 'Stamina Low! (|c0CF2B9' .. powerPool .. '|r)'
+ string = 'Stamina Low! (|c5C9D8E' .. powerPool .. '|r)'
elseif ( powerType == POWERTYPE_MOUNT_STAMINA ) then
- string = 'Mount Stamina Low! (|c0CF2B9' .. powerPool .. '|r)'
+ string = 'Mount Stamina Low! (|c5C9D8E' .. powerPool .. '|r)'
end
PlaySound( 'Quest_StepFailed' )