- Fixed a bug with menu desaturation where erase and close buttons stay colored after clicking on it.

- Fixed stretch where sometimes after release the window, all exceeded bars shows up and fade in again.
- Fixed a bug with the +- buttons on the window's scale option.
- Fixed the border for sub menus on mode menu.

classes/classe_instancia.lua

@@ -231,6 +231,12 @@ function _detalhes:GetMaxInstancesAmount()
 	return _detalhes.instances_amount
 end
 
+function _detalhes:SetMaxInstancesAmount (amount)
+	if (_type (amount) == "number") then
+		_detalhes.instances_amount = amount
+	end
+end
+
 function _detalhes:GetFreeInstancesAmount()
 	return _detalhes.instances_amount - #_detalhes.tabela_instancias
 end
@@ -484,6 +490,7 @@ end
 		end
 		
 		self:SetCombatAlpha (nil, nil, true)
+		self:DesaturateMenu()
 		
 		--if (self.hide_out_of_combat and not UnitAffectingCombat ("player")) then
 		--	self:SetWindowAlphaForCombat (true, true)
@@ -626,7 +633,7 @@ end
 			if (instancia and not instancia:IsAtiva()) then
 				instancia:AtivarInstancia()
 				_detalhes:DelayOptionsRefresh (instancia)
-				return
+				return instancia
 			end
 		end
 	
@@ -634,7 +641,7 @@ end
 		for index, instancia in _ipairs (_detalhes.tabela_instancias) do
 			if (not instancia:IsAtiva()) then
 				instancia:AtivarInstancia()
-				return
+				return instancia
 			end
 		end
 		
@@ -931,6 +938,8 @@ function _detalhes:agrupar_janelas (lados)
 	
 end
 
+_detalhes.MakeInstanceGroup = _detalhes.agrupar_janelas
+
 function _detalhes:UngroupInstance()
 	return self:Desagrupar (-1)
 end

core/network.lua

@@ -598,11 +598,15 @@
 			end
 		else
 			if (in_city) then
-				if (_detalhes.schedule_chat_leave) then
-					_detalhes:CancelTimer (_detalhes.schedule_chat_leave)
-				end
-				if (not _detalhes.schedule_chat_enter) then
-					_detalhes.schedule_chat_enter = _detalhes:ScheduleTimer ("EnterChatChannel", 5)
+			
+				local _, name = GetChannelName (2)
+				if (name) then
+					if (_detalhes.schedule_chat_leave) then
+						_detalhes:CancelTimer (_detalhes.schedule_chat_leave)
+					end
+					if (not _detalhes.schedule_chat_enter) then
+						_detalhes.schedule_chat_enter = _detalhes:ScheduleTimer ("EnterChatChannel", 5)
+					end
 				end
 			end
 		end

core/util.lua

@@ -648,6 +648,40 @@ end
 	end
 
 	--> todo: remove the function creation everytime this function run.
+	
+	local fade_IN_finished_func = function (frame)
+		if (frame.fading_in) then
+			frame.hidden = true
+			frame.faded = true
+			frame.fading_in = false
+			frame:Hide()
+		end
+	end
+	
+	local fade_OUT_finished_func = function (frame)
+		if (frame:IsShown() and frame.fading_out) then
+			frame.hidden = false
+			frame.faded = false
+			frame.fading_out = false
+		else
+			frame:SetAlpha(0)
+		end
+	end
+	
+	local just_fade_func = function (frame)
+		frame.hidden = false
+		frame.faded = true
+		frame.fading_in = false
+	end
+	
+	local anim_OUT_alpha_func = function (frame)
+		frame.fading_out = false
+	end
+
+	local anim_IN_alpha_func = function (frame)
+		frame.fading_in = false
+	end
+	
 	function gump:Fade (frame, tipo, velocidade, parametros)
 		
 		--if (frame.GetObjectType and frame:GetObjectType() == "Frame" and frame.GetName and type (frame:GetName()) == "string" and frame:GetName():find ("DetailsBaseFrame")) then
@@ -655,6 +689,7 @@ end
 		--end
 		
 		if (_type (frame) == "table") then 
+		
 			if (frame.meu_id) then --> ups, é uma instância
 				if (parametros == "barras") then --> hida todas as barras da instância
 					if (velocidade) then
@@ -716,13 +751,9 @@ end
 
 			_UIFrameFadeIn (frame, velocidade, frame:GetAlpha(), 0)
 			frame.fading_in = true
-			frame.fadeInfo.finishedFunc = 
-			function()
-				frame.hidden = true
-				frame.faded = true
-				frame.fading_in = false
-				frame:Hide()
-			end
+			
+			frame.fadeInfo.finishedFunc = fade_IN_finished_func
+			frame.fadeInfo.finishedArg1 = frame
 			
 		elseif (_upper (tipo) == "OUT") then --> aparecer
 			if (frame:GetAlpha() == 1 and not frame.hidden and not frame.fading_in) then --> ja esta na tela
@@ -738,12 +769,9 @@ end
 			frame:Show()
 			_UIFrameFadeOut (frame, velocidade, frame:GetAlpha(), 1.0)
 			frame.fading_out = true
-			frame.fadeInfo.finishedFunc = 
-				function() 
-					frame.hidden = false
-					frame.faded = false
-					frame.fading_out = false
-				end
+			
+			frame.fadeInfo.finishedFunc = fade_OUT_finished_func
+			frame.fadeInfo.finishedArg1 = frame
 				
 		elseif (tipo == 0) then --> força o frame a ser mostrado
 			frame.hidden = false
@@ -751,22 +779,15 @@ end
 			frame.fading_out = false
 			frame.fading_in = false
 			frame:Show()
-			frame:SetAlpha(1)
-			if (frame.fadeInfo) then --> limpa a função de fade se tiver alguma
-				frame.fadeInfo.finishedFunc = nil
-			end
+			frame:SetAlpha (1)
 			
 		elseif (tipo == 1) then --> força o frame a ser hidado
-
 			frame.hidden = true
 			frame.faded = true
 			frame.fading_out = false
 			frame.fading_in = false
+			frame:SetAlpha (0)
 			frame:Hide()
-			frame:SetAlpha(0)
-			if (frame.fadeInfo) then --> limpa a função de fade se tiver alguma
-				frame.fadeInfo.finishedFunc = nil
-			end
 			
 		elseif (tipo == -1) then --> apenas da fade sem hidar
 			if (frame:GetAlpha() == 0 and frame.hidden and not frame.fading_out) then --> ja esta escondida
@@ -781,13 +802,9 @@ end
 
 			_UIFrameFadeIn (frame, velocidade, frame:GetAlpha(), 0)
 			frame.fading_in = true
-			frame.fadeInfo.finishedFunc = 
-			function()
-				frame.hidden = false
-				frame.faded = true
-				frame.fading_in = false
-			end
-			
+			frame.fadeInfo.finishedFunc = just_fade_func
+			frame.fadeInfo.finishedArg1 = frame
+
 		elseif (_upper (tipo) == "ALPHAANIM") then
 
 			local value = velocidade
@@ -799,23 +816,22 @@ end
 					frame.fading_in = false
 					frame.fadeInfo.finishedFunc = nil
 				end
-				UIFrameFadeOut (frame, 0.3, currentApha, value)
+				_UIFrameFadeOut (frame, 0.3, currentApha, value)
 				frame.fading_out = true
-				frame.fadeInfo.finishedFunc = 
-				function()
-					frame.fading_out = false
-				end
+
+				frame.fadeInfo.finishedFunc = anim_OUT_alpha_func
+				frame.fadeInfo.finishedArg1 = frame
+
 			else
 				if (frame.fading_out) then --> se tiver uma animação de hidar em andamento se for true
 					frame.fading_out = false
 					frame.fadeInfo.finishedFunc = nil
 				end
-				UIFrameFadeIn (frame, 0.3, currentApha, value)
+				_UIFrameFadeIn (frame, 0.3, currentApha, value)
 				frame.fading_in = true
-				frame.fadeInfo.finishedFunc = 
-				function()
-					frame.fading_in = false
-				end
+				
+				frame.fadeInfo.finishedFunc = anim_IN_alpha_func
+				frame.fadeInfo.finishedArg1 = frame
 			end
 
 		elseif (_upper (tipo) == "ALPHA") then --> setando um alpha determinado

core/windows.lua

@@ -426,13 +426,14 @@
 					local barra = self.barras[index]
 					if (barra) then
 						if (index <= X) then
+							--gump:Fade (barra, 0)
 							gump:Fade (barra, "out")
 						else
-							if (self.baseframe.isStretching or self.auto_resize) then
+							--if (self.baseframe.isStretching or self.auto_resize) then
 								gump:Fade (barra, 1)
-							else
-								gump:Fade (barra, "in", 0.1)
-							end
+							--else
+							--	gump:Fade (barra, 1)
+							--end
 						end
 					end
 				end
@@ -461,7 +462,8 @@
 							if (self.baseframe.isStretching or self.auto_resize) then
 								gump:Fade (barra, 1)
 							else	
-								gump:Fade (barra, "in", 0.1)
+								--gump:Fade (barra, "in", 0.1)
+								gump:Fade (barra, 1)
 							end
 						end
 					end

functions/skins.lua

@@ -292,7 +292,7 @@ local _
 				icon_file = [[Interface\AddOns\Details\images\classes_small_alpha]],
 				start_after_icon = false,
 			},
-			attribute_text = {enabled = true, side = 1, text_size = 11, anchor = {-18, 4}, text_color = {1, 1, 1, 1}, text_face = "Arial Narrow"},			
+			attribute_text = {enabled = true, side = 1, text_size = 11, anchor = {-18, 5}, text_color = {1, 1, 1, 1}, text_face = "Arial Narrow"},			
 		},
 		
 		callback = function (skin, instance, just_updating)
@@ -981,11 +981,12 @@ local _
 			menu_anchor = {16, 2, side = 2},
 			menu_anchor_down = {16, -2},
 			plugins_grow_direction = 1,
+			menu_icons = {shadow = true},
 			
-			attribute_text = {enabled = true, anchor = {-20, 4}, text_face = "Friz Quadrata TT", text_size = 10, text_color = {1, 1, 1, .7}, side = 1, shadow = true},
+			attribute_text = {enabled = true, anchor = {-20, 5}, text_face = "Accidental Presidency", text_size = 12, text_color = {1, 1, 1, .7}, side = 1, shadow = true},
 			
 			hide_icon = true,
-			desaturated_menu = true,
+			desaturated_menu = false,
 			
 			bg_alpha = 0.51,
 			bg_r = 0.3294,
@@ -994,14 +995,14 @@ local _
 			show_statusbar = false,
 			
 			row_info = {
-					texture = "Details Serenity",
+					texture = "Skyline",
 					texture_class_colors = true, 
 					alpha = 0.80, 
 					texture_background_class_color = false,
 					texture_background = "Details D'ictum",
 					fixed_texture_color = {0, 0, 0},
 					fixed_texture_background_color = {0, 0, 0, 0.471},
-					space = {left = 1, right = -2, between = 1},
+					space = {left = 1, right = -2, between = 0},
 					backdrop = {enabled = true, size = 4, color = {0, 0, 0, 1}, texture = "Details BarBorder 2"},
 					icon_file = [[Interface\AddOns\Details\images\classes_small_alpha]],
 					start_after_icon = false,
@@ -1010,7 +1011,7 @@ local _
 			wallpaper = {
 				overlay = {1, 1,	1},
 				width = 256,
-				texcoord = {49/1024, 305/1024, 646/1024, 774/1024},
+				texcoord = {49/1024, 305/1024, 774/1024, 646/1024},
 				enabled = true,
 				anchor = "all",
 				height = 128,
@@ -1071,7 +1072,7 @@ local _
 			menu_anchor_down = {16, -2},
 			plugins_grow_direction = 1,
 			
-			attribute_text = {enabled = true, anchor = {-20, 4}, text_face = "Friz Quadrata TT", text_size = 10, text_color = {1, 1, 1, .7}, side = 1, shadow = true},
+			attribute_text = {enabled = true, anchor = {-20, 5}, text_face = "Accidental Presidency", text_size = 12, text_color = {1, 1, 1, .7}, side = 1, shadow = true},
 			
 			hide_icon = true,
 			desaturated_menu = true,

gumps/janela_options.lua

@@ -7,14 +7,14 @@
 	4 - row settings
 	5 - row texts
 	6 - window settings
-	7 - left menu
+	7 - title bar buttons
 	8 - row advanced
 	9 - wallpaper
 	10 - performance teaks
 	11 - raid tools
 	12 - plugins
 	13 - profiles
-	14 - attribute text
+	14 - title bar text
 	15 - custom spells
 	16 - data for charts
 	17 - auto hide settings
@@ -3070,7 +3070,7 @@ end
 
 		
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- General Settings - attribute ~14
+-- General Settings - title bar text ~14
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 function window:CreateFrame14()
 
@@ -5874,6 +5874,7 @@ function window:CreateFrame6()
 			s:SetBackdrop (slider_backdrop)
 			s:SetBackdropColor (unpack (slider_backdrop_color))
 			s:SetThumbSize (50)
+			s.fine_tuning = 0.011
 			
 			frame6.WindowScaleSlider:SetHook ("OnValueChange", function (self, instance, amount) 
 				instance:SetWindowScale (amount, true)

gumps/janela_principal.lua

@@ -4726,6 +4726,7 @@ local build_mode_list = function (self, elapsed)
 		
 		CoolTip:SetWallpaper (1, [[Interface\SPELLBOOK\Spellbook-Page-1]], menu_wallpaper_tex, menu_wallpaper_color, true)
 		CoolTip:SetBackdrop (1, _detalhes.tooltip_backdrop, nil, _detalhes.tooltip_border_color)
+		CoolTip:SetBackdrop (2, _detalhes.tooltip_backdrop, nil, _detalhes.tooltip_border_color)
 		
 		show_anti_overlap (instancia, self, "top")
 		
@@ -6328,6 +6329,10 @@ end
 		GameCooltip.buttonOver = true
 		self.instance.baseframe.cabecalho.button_mouse_over = true
 		
+		if (self.instance.desaturated_menu) then
+			self:GetNormalTexture():SetDesaturated (false)
+		end
+		
 		GameCooltip:Reset()
 		GameCooltip:SetType ("menu")
 		GameCooltip:SetOption ("ButtonsYMod", -2)
@@ -6360,6 +6365,10 @@ end
 	local reset_button_onleave = function (self)
 		OnLeaveMainWindow (self.instance, self)
 		
+		if (self.instance.desaturated_menu) then
+			self:GetNormalTexture():SetDesaturated (true)
+		end
+		
 		hide_anti_overlap (self.instance.baseframe.anti_menu_overlap)
 		
 		GameCooltip.buttonOver = false
@@ -6394,6 +6403,10 @@ end
 	local close_button_onenter = function (self)
 		OnEnterMainWindow (self.instance, self, 3)
 
+		if (self.instance.desaturated_menu) then
+			self:GetNormalTexture():SetDesaturated (false)
+		end
+		
 		local GameCooltip = GameCooltip
 		
 		GameCooltip.buttonOver = true
@@ -6440,6 +6453,10 @@ end
 	local close_button_onleave = function (self)
 		OnLeaveMainWindow (self.instance, self, 3)
 
+		if (self.instance.desaturated_menu) then
+			self:GetNormalTexture():SetDesaturated (true)
+		end
+		
 		hide_anti_overlap (self.instance.baseframe.anti_menu_overlap)
 		
 		GameCooltip.buttonOver = false
@@ -6937,7 +6954,7 @@ function gump:CriaCabecalho (baseframe, instancia)
 
 
 	
--- ~delete ~erase
+-- ~delete ~erase ~reset
 --> RESETAR HISTORICO ----------------------------------------------------------------------------------------------------------------------------------------------------
 
 	baseframe.cabecalho.reset = CreateFrame ("button", "DetailsClearSegmentsButton" .. instancia.meu_id, baseframe)
@@ -6966,43 +6983,4 @@ function gump:CriaCabecalho (baseframe, instancia)
 --> fim botão reset
 
 
---[[
-
---> teste com shadows
-
---modo
-	local shadow = baseframe.cabecalho.modo_selecao:CreateTexture ("sombra", "background")
-	shadow:SetPoint ("center", baseframe.cabecalho.modo_selecao.widget, "center")
-	shadow:SetTexture ("Interface\\PetBattles\\PetBattle-SelectedPetGlow")
-	shadow:SetVertexColor (0, 0, 0, 1)
-	shadow:SetSize (22, 22)
---segmentos
-	local shadow = baseframe.cabecalho.segmento:CreateTexture ("sombra2", "background")
-	shadow:SetPoint ("center", baseframe.cabecalho.segmento.widget, "center")
-	shadow:SetTexture ("Interface\\PetBattles\\PetBattle-SelectedPetGlow")
-	shadow:SetVertexColor (0, 0, 0, 1)
-	shadow:SetSize (22, 22)
---atributo
-	local shadow = baseframe.cabecalho.atributo:CreateTexture ("sombra3", "background")
-	shadow:SetPoint ("center", baseframe.cabecalho.atributo.widget, "center")
-	shadow:SetTexture ("Interface\\PetBattles\\PetBattle-SelectedPetGlow")
-	shadow:SetVertexColor (0, 0, 0, 1)
-	shadow:SetSize (12, 16)
-	shadow:SetTexCoord (0.0, 0.0, 0.3, 0.3, 0.7, 0.7, 1, 1)
---report
-	local shadow = baseframe.cabecalho.report:CreateTexture ("sombra4", "background")
-	shadow:SetPoint ("center", baseframe.cabecalho.report.widget, "center")
-	shadow:SetTexture ("Interface\\PetBattles\\PetBattle-SelectedPetGlow")
-	shadow:SetVertexColor (0, 0, 0, 1)
-	shadow:SetSize (22, 22)
-	
---baseToolbar.novo, baseToolbar.fechar, baseToolbar.reset}baseToolbar.modo_selecao, baseToolbar.segmento, baseToolbar.atributo, baseToolbar.report	
-
-	local shadow = UIParent:CreateTexture ("SombraTeste", "background")
-	shadow:SetPoint ("center", UIParent, "center", 200, 0)
-	shadow:SetTexture ("Interface\\PetBattles\\PetBattle-SelectedPetGlow")
-	shadow:SetVertexColor (0, 0, 0, 1)
-	shadow:SetSize (300, 300)
-	shadow:SetTexCoord (0.0, 0.0, 0.3, 0.3, 0.7, 0.7, 1, 1)
-	--]]
 end