10.2.0 (52129)

Gethe · Nov 14, 2023 · 982367f · 982367f
1 parent b4e1e61
commit 982367f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/Interface/FrameXML/EventToastManager.lua b/Interface/FrameXML/EventToastManager.lua
@@ -165,8 +165,6 @@ function EventToastManagerFrameMixin:AreAnimationsPaused()
 end
 
 function EventToastManagerFrameMixin:PauseAnimations()
-	-- TODO: Tech debt: currentDisplayingToast does not take non-EventToastManager toasts into consideration <WOW10-127543>
-	-- ^ We should be setting it or checking to see if there are other TopBannerManager toasts playing or paused...
 	if(self.animationsPaused or not (self.currentDisplayingToast and (self.currentDisplayingToast:GetAlpha() > 0))) then 
 		return;
 	end

diff --git a/Interface/FrameXML/GossipFrameShared.lua b/Interface/FrameXML/GossipFrameShared.lua
@@ -90,9 +90,11 @@ function GossipOptionButtonMixin:Setup(optionInfo)
 
 	if QuestUtil.QuestTextContrastUseLightText() then
 		local textColor, titleTextColor = GetMaterialTextColors("Stone");
+		self:GetFontString():SetFixedColor(true);
 		self:GetFontString():SetTextColor(textColor[1], textColor[2], textColor[3]);
 	else
 		local textColor, titleTextColor = GetMaterialTextColors("Parchment");
+		self:GetFontString():SetFixedColor(false);
 		self:GetFontString():SetTextColor(textColor[1], textColor[2], textColor[3]);
 	end
 end

diff --git a/Interface/FrameXML/TopBannerManager.lua b/Interface/FrameXML/TopBannerManager.lua
@@ -37,8 +37,6 @@ end
 function TopBannerManager_LoadingScreenEnabled()
 	if ( TopBannerMgr.currentBanner ) then
 		TopBannerMgr.currentBanner.frame:StopBanner();
-
-		TopBannerQueue = {}; -- clear out banner queue;
 	end
 end
 
@@ -47,7 +45,7 @@ function TopBannerManager_LoadingScreenDisabled()
 	if ( currentBanner and currentBanner.frame.ResumeBanner ) then
 		currentBanner.frame:ResumeBanner(currentBanner.data);
 	else
-		TopBannerMgr.currentBanner = nil;
+		TopBannerManager_BannerFinished();
 	end
 end