Skip to content

Commit 1ea392d

Browse files
committed
Extract version label chrome logic to a dedicated class
1 parent 806f0fd commit 1ea392d

File tree

11 files changed

+32
-12
lines changed

11 files changed

+32
-12
lines changed

OpenRA.Mods.Common/Widgets/Logic/Ingame/GameSaveLoadingLogic.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ public GameSaveLoadingLogic(Widget widget, ModData modData, World world)
2020
{
2121
widget.Get<ProgressBarWidget>("PROGRESS").GetPercentage = () => world.GameSaveLoadingPercentage;
2222

23-
var versionLabel = widget.GetOrNull<LabelWidget>("VERSION_LABEL");
24-
if (versionLabel != null)
25-
{
26-
var versionText = modData.Manifest.Metadata.Version;
27-
versionLabel.GetText = () => versionText;
28-
}
29-
3023
var keyhandler = widget.Get<LogicKeyListenerWidget>("CANCEL_HANDLER");
3124
keyhandler.AddHandler(e =>
3225
{

OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameMenuLogic.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@ public IngameMenuLogic(Widget widget, ModData modData, World world, Action onExi
187187
mpe = world.WorldActor.TraitOrDefault<MenuPostProcessEffect>();
188188
mpe?.Fade(mpe.Info.MenuEffect);
189189

190-
var versionText = modData.Manifest.Metadata.Version;
191-
menu.Get<LabelWidget>("VERSION_LABEL").GetText = () => versionText;
192-
193190
buttonContainer = menu.Get("MENU_BUTTONS");
194191
buttonTemplate = buttonContainer.Get<ButtonWidget>("BUTTON_TEMPLATE");
195192
buttonContainer.RemoveChild(buttonTemplate);

OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ public MainMenuLogic(Widget widget, World world, ModData modData)
6969
this.modData = modData;
7070

7171
rootMenu = widget;
72-
var versionText = modData.Manifest.Metadata.Version;
73-
rootMenu.Get<LabelWidget>("VERSION_LABEL").GetText = () => versionText;
7472

7573
// Menu buttons
7674
var mainMenu = widget.Get("MAIN_MENU");
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#region Copyright & License Information
2+
/*
3+
* Copyright (c) The OpenRA Developers and Contributors
4+
* This file is part of OpenRA, which is free software. It is made
5+
* available to you under the terms of the GNU General Public License
6+
* as published by the Free Software Foundation, either version 3 of
7+
* the License, or (at your option) any later version. For more
8+
* information, see COPYING.
9+
*/
10+
#endregion
11+
12+
using OpenRA.Widgets;
13+
14+
namespace OpenRA.Mods.Common.Widgets.Logic
15+
{
16+
public class VersionLabelLogic : ChromeLogic
17+
{
18+
[ObjectCreator.UseCtor]
19+
public VersionLabelLogic(LabelWidget widget, ModData modData)
20+
{
21+
var versionText = modData.Manifest.Metadata.Version;
22+
widget.GetText = () => versionText;
23+
}
24+
}
25+
}

mods/cnc/chrome/gamesave-loading.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Container@GAMESAVE_LOADING_SCREEN:
2222
ImageCollection: logos
2323
ImageName: eva
2424
Label@VERSION_LABEL:
25+
Logic: VersionLabelLogic
2526
X: WINDOW_RIGHT - 128 - 43
2627
Y: 116
2728
Width: 128

mods/cnc/chrome/ingame-menu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Container@INGAME_MENU:
1313
ImageCollection: logos
1414
ImageName: eva
1515
Label@VERSION_LABEL:
16+
Logic: VersionLabelLogic
1617
X: WINDOW_RIGHT - 128 - 43
1718
Y: 116
1819
Width: 128

mods/cnc/chrome/mainmenu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Container@MENU_BACKGROUND:
3131
ImageCollection: logos
3232
ImageName: eva
3333
Label@VERSION_LABEL:
34+
Logic: VersionLabelLogic
3435
X: WINDOW_RIGHT - 128 - 43
3536
Y: 116
3637
Width: 128

mods/common/chrome/ingame-menu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Container@INGAME_MENU:
1717
ImageCollection: logos
1818
ImageName: logo
1919
Label@VERSION_LABEL:
20+
Logic: VersionLabelLogic
2021
X: WINDOW_RIGHT - 296
2122
Y: 296 - 19
2223
Width: 296 - 20

mods/common/chrome/mainmenu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Container@MAINMENU:
2121
ImageCollection: logos
2222
ImageName: logo
2323
Label@VERSION_LABEL:
24+
Logic: VersionLabelLogic
2425
X: WINDOW_RIGHT - 296
2526
Y: 296 - 20
2627
Width: 296 - 20

mods/d2k/chrome/ingame-menu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Container@INGAME_MENU:
66
ButtonStride: 0, 40
77
Children:
88
Label@VERSION_LABEL:
9+
Logic: VersionLabelLogic
910
X: WINDOW_RIGHT - 10
1011
Y: WINDOW_BOTTOM - 19
1112
Align: Right

0 commit comments

Comments
 (0)