Added auto alignment for Align Text Columns

Details.toc

@@ -26,6 +26,7 @@ boot.lua
 indent.lua
 core\util.lua
 API.lua
+functions\events.lua
 
 functions\profiles.lua
 functions\hooks.lua
@@ -34,7 +35,6 @@ functions\coach.lua
 functions\skins.lua
 functions\boss.lua
 functions\spells.lua
-functions\events.lua
 functions\classes.lua
 functions\buff.lua
 functions\spellcache.lua

classes/class_damage.lua

@@ -2397,9 +2397,118 @@ function atributo_damage:RefreshWindow (instancia, tabela_do_combate, forcar, ex
 	
 	Details.LastFullDamageUpdate = Details._tempo
 	
+	instancia:AutoAlignInLineFontStrings()
+
 	return Details:EndRefresh(instancia, total, tabela_do_combate, showing) --> retorna a tabela que precisa ganhar o refresh
 end
 
+function Details:AutoAlignInLineFontStrings()
+	
+	--if this instance is using in line texts, check the min distance and the length of strings to make them more spread appart
+	if (self.use_multi_fontstrings and self.use_auto_align_multi_fontstrings) then
+		local maxStringLength_StringFour = 0
+		local maxStringLength_StringThree = 0
+		local profileOffsetString3 = self.fontstrings_text3_anchor
+		local profileOffsetString2 = self.fontstrings_text2_anchor
+		local offsetTotal = 0
+
+		Details.CacheInLineMaxDistance = Details.CacheInLineMaxDistance or {}
+		Details.CacheInLineMaxDistance[self:GetId()] = Details.CacheInLineMaxDistance[self:GetId()] or {[2] = profileOffsetString2, [3] = profileOffsetString3}
+
+		--space between string4 and string3 (usually dps is 4 and total value is 3)
+		for lineId = 1, self:GetNumLinesShown() do
+			local thisLine = self:GetLine(lineId)
+
+			--check strings 3 and 4
+			if (thisLine.lineText4:GetText() ~= "" and thisLine.lineText3:GetText() ~= "") then
+				--the length of the far right string determines the space between it and the next string in the left
+				local stringLength = thisLine.lineText4:GetStringWidth()
+				maxStringLength_StringFour = stringLength > maxStringLength_StringFour and stringLength or maxStringLength_StringFour
+			end
+			
+			--check strings 2 and 3
+			if (thisLine.lineText2:GetText() ~= "" and thisLine.lineText3:GetText() ~= "") then
+				--the length of the middle string determines the space between it and the next string in the left
+				local stringLength = thisLine.lineText3:GetStringWidth()
+				maxStringLength_StringThree = stringLength > maxStringLength_StringThree and stringLength or maxStringLength_StringThree
+			end
+		end
+
+		--if the length bigger than the min distance? calculate for string4 to string3 distance
+		if ((maxStringLength_StringFour > 0) and (maxStringLength_StringFour + 5 > profileOffsetString3)) then
+			local newOffset = maxStringLength_StringFour + 5
+
+			--check if the current needed min distance is bigger than the distance stored in the cache
+			local currentCacheMaxValue = Details.CacheInLineMaxDistance[self:GetId()][3]
+			if (currentCacheMaxValue < newOffset) then
+				currentCacheMaxValue = newOffset
+				Details.CacheInLineMaxDistance[self:GetId()][3] = currentCacheMaxValue
+			else
+				--if not, use the distance value cached to avoid jittering in the string
+				newOffset = currentCacheMaxValue
+			end
+
+			--update the lines
+			for lineId = 1, self:GetNumLinesShown() do
+				local thisLine = self:GetLine(lineId)
+				thisLine.lineText3:SetPoint("right", thisLine.statusbar, "right", -newOffset, 0)
+			end
+		end
+
+		--check if there's length in the third string, also the third string cannot have a length if the second string is empty
+		if (maxStringLength_StringThree > 0) then
+			local newOffset = maxStringLength_StringThree + maxStringLength_StringFour + 14
+			if (newOffset >= profileOffsetString2) then
+				--check if the current needed min distance is bigger than the distance stored in the cache
+				local currentCacheMaxValue = Details.CacheInLineMaxDistance[self:GetId()][2]
+				if (currentCacheMaxValue < newOffset) then
+					currentCacheMaxValue = newOffset
+					Details.CacheInLineMaxDistance[self:GetId()][2] = currentCacheMaxValue
+				else
+					--if not, use the distance value cached to avoid jittering in the string
+					newOffset = currentCacheMaxValue
+				end
+
+				--update the lines
+				for lineId = 1, self:GetNumLinesShown() do
+					local thisLine = self:GetLine(lineId)
+					thisLine.lineText2:SetPoint("right", thisLine.statusbar, "right", -newOffset, 0)
+				end
+			end
+		end
+
+		--reduce the size of the actor name string based on the total size of all strings in the right side
+		for lineId = 1, self:GetNumLinesShown() do
+			local thisLine = self:GetLine(lineId)
+
+			local playerName = thisLine.lineText1
+			local text2 = thisLine.lineText2
+			local text3 = thisLine.lineText3
+			local text4 = thisLine.lineText4
+
+			local totalWidth = text2:GetStringWidth() + text3:GetStringWidth() + text4:GetStringWidth()
+			totalWidth = totalWidth + 50
+
+			DetailsFramework:TruncateText(playerName, self.cached_bar_width - totalWidth)
+			--playerName:SetWidth(self.cached_bar_width - totalWidth)
+		end
+	end
+end
+
+--handle internal details! events
+local eventListener = Details:CreateEventListener()
+eventListener:RegisterEvent("COMBAT_PLAYER_ENTER", function()
+	if (Details.CacheInLineMaxDistance) then
+		wipe(Details.CacheInLineMaxDistance)
+
+		for i = 1, 10 do
+			C_Timer.After(i, function()
+				wipe(Details.CacheInLineMaxDistance)
+			end)
+		end
+	end
+end)
+
 local actor_class_color_r, actor_class_color_g, actor_class_color_b
 
 -- ~texts

classes/class_heal.lua

@@ -585,8 +585,10 @@ function atributo_heal:RefreshWindow (instancia, tabela_do_combate, forcar, expo
 		end
 	end
 
+	instancia:AutoAlignInLineFontStrings()
+
 	-- showing.need_refresh = false
-	return _detalhes:EndRefresh (instancia, total, tabela_do_combate, showing) --> retorna a tabela que precisa ganhar o refresh
+	return Details:EndRefresh (instancia, total, tabela_do_combate, showing) --> retorna a tabela que precisa ganhar o refresh
 	
 end
 

classes/class_instance.lua

@@ -304,6 +304,16 @@ function _detalhes:GetSkinTexture()
 	return _detalhes.skins [self.skin] and _detalhes.skins [self.skin].file
 end
 
+function Details:GetAllLines()
+	return self.barras
+end
+function Details:GetLine(lineId) --alias of _detalhes:GetRow(index)
+	return self.barras[lineId]
+end
+function Details:GetNumLinesShown() --alis of _detalhes:GetNumRows()
+	return self.rows_fit_in_window
+end
+
 ------------------------------------------------------------------------------------------------------------------------
 
 --> retorna se a inst�ncia esta ou n�o ativa

classes/include_instance.lua

@@ -187,10 +187,10 @@ _detalhes.instance_defaults = {
 
 		--use one fontstring for each value in the lines, e.g. one fontstring to damage done, another fontstring to dps and another to percent amount
 		use_multi_fontstrings = true,
-		fontstrings_width = 35, --not in use
+		use_auto_align_multi_fontstrings = true,
 		fontstrings_text4_anchor = 0,
-		fontstrings_text3_anchor = 35,
-		fontstrings_text2_anchor = 70,
+		fontstrings_text3_anchor = 38,
+		fontstrings_text2_anchor = 73,
 
 	--row info
 		row_info = {

frames/window_main.lua

@@ -4597,6 +4597,14 @@ function _detalhes:FastPSUpdate (enabled)
 end
 
 
+function Details:AdjustInLineTextPadding()
+	for _, row in ipairs(self.barras) do 
+		row.lineText2:SetPoint("right", row.statusbar, "right", -self.fontstrings_text2_anchor, 0)
+		row.lineText3:SetPoint("right", row.statusbar, "right", -self.fontstrings_text3_anchor, 0)
+		row.lineText4:SetPoint("right", row.statusbar, "right", -self.fontstrings_text4_anchor, 0)
+	end
+end
+
 -- search key: ~row ~bar ~updatebar
 function _detalhes:InstanceRefreshRows (instancia)
 	

frames/window_options2_sections.lua

@@ -1556,6 +1556,19 @@ do
                 desc = Loc ["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_DESC"],
             },
 
+            {--inline auto align enabled
+                type = "toggle",
+                get = function() return currentInstance.use_auto_align_multi_fontstrings end,
+                set = function (self, fixedparam, value)
+                    editInstanceSetting(currentInstance, "use_auto_align_multi_fontstrings", value)
+                    editInstanceSetting(currentInstance, "InstanceRefreshRows")
+                    _detalhes:RefreshMainWindow(-1, true)
+                    afterUpdate()
+                end,
+                name = Loc ["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_AUTOALIGN"],
+                desc = Loc ["STRING_OPTIONS_ALIGNED_TEXT_COLUMNS_AUTOALIGN_DESC"],
+            },
+
             {--lineText2 (left, usuali is the 'done' amount)
                 type = "range",
                 get = function() return tonumber (currentInstance.fontstrings_text2_anchor) end,