From eae6d33cd985322209a4c28de90057bf0ee3ca53 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 29 Dec 2021 00:24:15 +0100 Subject: [PATCH] Fix highlighting of the credits tabs --- OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs index 06d07f9841..f7096eabbb 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/CreditsLogic.cs @@ -24,6 +24,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic bool showModTab; bool showEngineTab; + bool isShowingModTab; readonly IEnumerable modLines; readonly IEnumerable engineLines; @@ -47,7 +48,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic modLines = ParseLines(modData.DefaultFileSystem.Open(modCredits.ModCreditsFile)); var modTab = tabContainer.Get("MOD_TAB"); - modTab.IsHighlighted = () => showModTab; + modTab.IsHighlighted = () => isShowingModTab; modTab.OnClick = () => ShowCredits(true); modTab.GetText = () => modCredits.ModTabTitle; } @@ -58,7 +59,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic engineLines = ParseLines(File.OpenRead(Platform.ResolvePath(modCredits.EngineCreditsFile))); var engineTab = tabContainer.Get("ENGINE_TAB"); - engineTab.IsHighlighted = () => !showModTab; + engineTab.IsHighlighted = () => !isShowingModTab; engineTab.OnClick = () => ShowCredits(false); } @@ -78,6 +79,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic void ShowCredits(bool modCredits) { + isShowingModTab = modCredits; + scrollPanel.RemoveChildren(); foreach (var line in modCredits ? modLines : engineLines) {