Skip to content

Commit

Permalink
More fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tercioo committed Jul 30, 2020
1 parent 49c0742 commit 1923659
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 13 deletions.
1 change: 1 addition & 0 deletions Libs/DF/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ feedback_sites.blp
icons.blp
mail.blp
*.json
CHANGES.txt
2 changes: 1 addition & 1 deletion Libs/DF/fw.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

local dversion = 190
local dversion = 192

local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)
Expand Down
20 changes: 12 additions & 8 deletions Libs/DF/panel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5123,6 +5123,7 @@ DF.IconRowFunctions = {
cooldownFrame:SetAllPoints()
cooldownFrame:EnableMouse (false)
cooldownFrame:SetFrameLevel (newIconFrame:GetFrameLevel()+1)
cooldownFrame.noCooldownCount = self.options.surpress_tulla_omni_cc

newIconFrame.CountdownText = cooldownFrame:CreateFontString (nil, "overlay", "GameFontNormal")
--newIconFrame.CountdownText:SetPoint ("center")
Expand Down Expand Up @@ -5347,6 +5348,7 @@ local default_icon_row_options = {
backdrop_border_color = {0, 0, 0, 1},
anchor = {side = 6, x = 2, y = 0},
grow_direction = 1, --1 = to right 2 = to left
surpress_tulla_omni_cc = false,
}

function DF:CreateIconRow (parent, name, options)
Expand Down Expand Up @@ -8299,17 +8301,18 @@ DF.CastFrameFunctions = {
self.flashTexture:Hide()
self:Animation_StopAllAnimations()

self:SetAlpha (1)

--> set the statusbar color
self:UpdateCastColor()

if (not self:IsShown()) then
self:Animation_FadeIn()
end

self.Spark:Show()
self:SetAlpha (1)
self:Show()

--> set the statusbar color
self:UpdateCastColor()

--> update the interrupt cast border
self:UpdateInterruptState()

Expand Down Expand Up @@ -8355,16 +8358,17 @@ DF.CastFrameFunctions = {
self.flashTexture:Hide()
self:Animation_StopAllAnimations()

self:SetAlpha (1)

--> set the statusbar color
self:UpdateCastColor()

if (not self:IsShown()) then
self:Animation_FadeIn()
end

self.Spark:Show()
self:SetAlpha (1)
self:Show()

--> set the statusbar color
self:UpdateCastColor()

--> update the interrupt cast border
self:UpdateInterruptState()
Expand Down
Loading

0 comments on commit 1923659

Please sign in to comment.