diff --git a/ShestakUI/Config/DataText.lua b/ShestakUI/Config/DataText.lua index 2430d0297..811bfe102 100644 --- a/ShestakUI/Config/DataText.lua +++ b/ShestakUI/Config/DataText.lua @@ -146,7 +146,7 @@ LPSTAT_CONFIG = { tip_anchor = cBN and "TOPRIGHT" or C.bag.enable and "TOPRIGHT" or "BOTTOMRIGHT", tip_x = cBN and 0 or C.bag.enable and -50 or -21, tip_y = cBN and 85 or C.bag.enable and 0 or 20, - strata = cBN and "DIALOG" or "MEDIUM", + strata = cBN and "DIALOG" or "HIGH", level = 10 }, -- Top block diff --git a/ShestakUI/Config/DataText_TBC.lua b/ShestakUI/Config/DataText_TBC.lua index 8c303f04e..bdd52c191 100644 --- a/ShestakUI/Config/DataText_TBC.lua +++ b/ShestakUI/Config/DataText_TBC.lua @@ -146,7 +146,7 @@ LPSTAT_CONFIG = { tip_anchor = cBN and "TOPRIGHT" or C.bag.enable and "TOPRIGHT" or "BOTTOMRIGHT", tip_x = cBN and 0 or C.bag.enable and -50 or -21, tip_y = cBN and 85 or C.bag.enable and 0 or 20, - strata = cBN and "DIALOG" or "MEDIUM", + strata = cBN and "DIALOG" or "HIGH", level = 10 }, -- Top block diff --git a/ShestakUI/Config/DataText_Vanilla.lua b/ShestakUI/Config/DataText_Vanilla.lua index 8c303f04e..bdd52c191 100644 --- a/ShestakUI/Config/DataText_Vanilla.lua +++ b/ShestakUI/Config/DataText_Vanilla.lua @@ -146,7 +146,7 @@ LPSTAT_CONFIG = { tip_anchor = cBN and "TOPRIGHT" or C.bag.enable and "TOPRIGHT" or "BOTTOMRIGHT", tip_x = cBN and 0 or C.bag.enable and -50 or -21, tip_y = cBN and 85 or C.bag.enable and 0 or 20, - strata = cBN and "DIALOG" or "MEDIUM", + strata = cBN and "DIALOG" or "HIGH", level = 10 }, -- Top block diff --git a/ShestakUI/Config/DataText_Wrath.lua b/ShestakUI/Config/DataText_Wrath.lua index 2e5df04e5..5513aff8e 100644 --- a/ShestakUI/Config/DataText_Wrath.lua +++ b/ShestakUI/Config/DataText_Wrath.lua @@ -146,7 +146,7 @@ LPSTAT_CONFIG = { tip_anchor = cBN and "TOPRIGHT" or C.bag.enable and "TOPRIGHT" or "BOTTOMRIGHT", tip_x = cBN and 0 or C.bag.enable and -50 or -21, tip_y = cBN and 85 or C.bag.enable and 0 or 20, - strata = cBN and "DIALOG" or "MEDIUM", + strata = cBN and "DIALOG" or "HIGH", level = 10 }, -- Top block diff --git a/ShestakUI/Modules/Blizzard/Bags.lua b/ShestakUI/Modules/Blizzard/Bags.lua index d53b3dbe7..df0cc74f8 100644 --- a/ShestakUI/Modules/Blizzard/Bags.lua +++ b/ShestakUI/Modules/Blizzard/Bags.lua @@ -702,7 +702,7 @@ function Stuffing:SlotNew(bag, slot) ret.frame:StyleButton() ret.frame:SetTemplate("Default") ret.frame:SetNormalTexture(0) - ret.frame:SetFrameStrata("MEDIUM") + ret.frame:SetFrameStrata("HIGH") ret.icon = _G[ret.frame:GetName().."IconTexture"] ret.icon:CropIcon() @@ -945,7 +945,7 @@ function Stuffing:CreateBagFrame(w) local f = CreateFrame("Frame", n, UIParent) f:EnableMouse(true) f:SetMovable(true) - f:SetFrameStrata("MEDIUM") + f:SetFrameStrata("HIGH") f:SetFrameLevel(10) f:RegisterForDrag("LeftButton") f:SetScript("OnDragStart", function(self) diff --git a/ShestakUI/Modules/UnitFrames/Functions.lua b/ShestakUI/Modules/UnitFrames/Functions.lua index ff10f131b..629d3d97f 100644 --- a/ShestakUI/Modules/UnitFrames/Functions.lua +++ b/ShestakUI/Modules/UnitFrames/Functions.lua @@ -604,6 +604,18 @@ T.PostCastStart = function(Castbar, unit) end end +local function GetFormattedTime(s) + local day, hour, minute = 86400, 3600, 60 + if s >= day then + return format("%dd", floor(s / day + 0.5)), s % day + elseif s >= hour then + return format("%dh", floor(s / hour + 0.5)), s % hour + elseif s >= minute then + return format("%dm", floor(s / minute + 0.5)), s % minute + end + return floor(s + 0.5), s - floor(s) +end + T.CustomCastTimeText = function(self, duration) self.Time:SetText(("%.1f / %.1f"):format(self.channeling and duration or self.max - duration, self.max)) end