Applied a round of polishing to the Breakdown Window

This commit is contained in:
Tercio Jose
2024-03-03 15:18:10 -03:00
parent ca192bb646
commit b1a7c5e278
14 changed files with 246 additions and 34 deletions
@@ -1538,6 +1538,7 @@ function spellsTab.CreateSpellBar(self, index) --~spellbar ~spellline ~spell ~cr
local spellIcon = spellIconFrame:CreateTexture("$parentTexture", "overlay")
spellIcon:SetAllPoints()
spellIcon:SetTexCoord(.1, .9, .1, .9)
detailsFramework:SetMask(spellIcon, [[Interface\COMMON\common-iconmask]])
spellBar.spellIcon = spellIcon
--create a square frame which is placed at the right side of the line to show which targets for damaged by the spell
@@ -1,10 +1,14 @@
---@type details
local Details = Details
local GameTooltip = GameTooltip
---@type detailsframework
local detailsFramework = DetailsFramework
local GameTooltip = GameTooltip
local unpack = unpack
local CreateFrame = CreateFrame
local GetSpellInfo = GetSpellInfo
local _
Details.BuffUptimeSpellsToIgnore = {
[186401] = true, --Sign of the Skirmisher
@@ -70,7 +74,9 @@ local createAuraTabOnBreakdownWindow = function(tab, frame)
local iconTexture = line:CreateTexture("$parentIcon", "overlay")
iconTexture:SetSize(scroll_line_height -2 , scroll_line_height - 2)
iconTexture:SetAlpha(0.834)
iconTexture:SetAlpha(0.924)
detailsFramework:SetMask(iconTexture, [[Interface\COMMON\common-iconmask]])
local nameLabel = line:CreateFontString("$parentName", "overlay", "GameFontNormal")
local uptimeLabel = line:CreateFontString("$parentUptime", "overlay", "GameFontNormal")
local uptimePercentLabel = line:CreateFontString("$parentPercent", "overlay", "GameFontNormal")
@@ -331,6 +331,7 @@ local createPlayerScrollBox = function(breakdownWindowFrame, breakdownSideMenu,
local specIcon = upFrame:CreateTexture("$parentSpecIcon", "artwork")
specIcon:SetSize(headerTable[1].width - 1, headerTable[1].width - 1)
specIcon:SetAlpha(0.71)
detailsFramework:SetMask(specIcon, [[Interface\COMMON\common-iconmask]])
local roleIcon = upFrame:CreateTexture("$parentRoleIcon", "overlay")
roleIcon:SetSize((player_line_height-2) / 2, (player_line_height-2) / 2)
@@ -505,13 +506,19 @@ local createSegmentsScrollBox = function(breakdownWindowFrame, breakdownSideMenu
local updateSegmentLine = function(self, index, segmentData) --~update
local combatName = segmentData.combatName
local r, g, b = segmentData.r, segmentData.g, segmentData.b
local atlasInfo = segmentData.combatIcon
local combatIcon1 = segmentData.combatIcon
local combatIcon2 = segmentData.combatIcon2
self.segmentText:SetText(combatName)
self.segmentText:SetTextColor(r, g, b)
detailsFramework:TruncateText(self.segmentText, player_scroll_size[1] - 20)
detailsFramework:SetAtlas(self.segmentIcon, combatIcon1)
detailsFramework:SetAtlas(self.segmentIcon, atlasInfo)
if (combatIcon2) then
detailsFramework:SetAtlas(self.segmentSubIcon, combatIcon2)
else
self.segmentSubIcon:SetTexture("")
end
self.combatUniqueID = segmentData.UID
@@ -569,6 +576,10 @@ local createSegmentsScrollBox = function(breakdownWindowFrame, breakdownSideMenu
segmentIcon:SetSize(player_line_height - 4, player_line_height - 4)
segmentIcon:SetAlpha(0.834)
local segmentSubIcon = detailsFramework:CreateTexture(line, "", player_line_height, player_line_height - 1, "artwork")
segmentSubIcon:SetSize(player_line_height - 4, player_line_height - 4)
segmentSubIcon:SetAlpha(0.834)
local segmentText = detailsFramework:CreateLabel(line, "", fontSize or 11, "white", "GameFontNormal")
segmentText.outline = fontOutline or "none"
segmentText.textcolor = {1, 1, 1, .9}
@@ -578,9 +589,11 @@ local createSegmentsScrollBox = function(breakdownWindowFrame, breakdownSideMenu
line.segmentText = segmentText
line.segmentIcon = segmentIcon
line.segmentSubIcon = segmentSubIcon
segmentIcon:SetPoint("left", line, "left", 2, 0)
segmentText:SetPoint("left", segmentIcon, "right", 3, 1)
segmentSubIcon:SetPoint("left", segmentIcon, "right", 2, 0)
segmentText:SetPoint("left", segmentSubIcon, "right", 3, 1)
line.UpdateLine = updateSegmentLine
@@ -773,12 +786,13 @@ function breakdownWindowPlayerList.CreatePlayerListFrame()
local UID = combatObject:GetCombatUID()
local combatName, r, g, b = combatObject:GetCombatName(true)
local combatIcon = combatObject:GetCombatIcon()
local combatIcon, combatSubIcon = combatObject:GetCombatIcon()
segmentsData[i] = {
UID = UID,
combatName = combatName,
combatIcon = combatIcon,
combatIcon2 = combatSubIcon,
r = r or 1,
g = g or 1,
b = b or 1,
+5 -3
View File
@@ -6368,7 +6368,7 @@ local buildSegmentTooltip = function(self, deltaTime)
local mythicDungeonRunId
local statusBarTexture = "Skyline"
local combatTimeColor = "silver"
local combatTimeColor = "gray"
local combatTimeColorGeneric = "gray"
for i = Details.segments_amount, 1, -1 do
@@ -6424,7 +6424,8 @@ local buildSegmentTooltip = function(self, deltaTime)
--dumpt(mythicDungeonInfo)
gameCooltip:AddLine(broomStick .. " " .. combatName, detailsFramework:IntegerToTimer(thisCombat:GetCombatTime()), 1, dungeonColor, combatTimeColor)
gameCooltip:AddIcon(thisCombat:GetCombatIcon(), "main", "left", nil, nil, nil, nil, nil, nil, nil, nil, true)
local bDesaturated = false
gameCooltip:AddIcon(thisCombat:GetCombatIcon(), "main", "left", nil, nil, nil, nil, nil, nil, nil, nil, bDesaturated)
--submenu
gameCooltip:AddLine(Loc["STRING_SEGMENT_TRASH"], nil, 2, "white", "white")
@@ -6651,7 +6652,7 @@ local buildSegmentTooltip = function(self, deltaTime)
else
mythicDungeonRunId = false
local bFindEnemyName = true
gameCooltip:AddLine(thisCombat:GetCombatName(false, bFindEnemyName), formattedElapsedTime, 1, "yellow", combatTimeColorGeneric)
gameCooltip:AddLine(thisCombat:GetCombatName(false, bFindEnemyName), _, 1, "yellow", combatTimeColorGeneric) --formattedElapsedTime
gameCooltip:AddIcon(thisCombat:GetCombatIcon(), "main", "left")
--print("passing here...")
@@ -6696,6 +6697,7 @@ local buildSegmentTooltip = function(self, deltaTime)
GameCooltip:AddLine("$div", nil, nil, -5, -13)
---------------------------------------------------------------------------------------------------------------------------------------------------
--> current combat
local thisCombat = Details:GetCurrentCombat()
local dateStart, dateEnd = thisCombat:GetDate()