epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dynamically populate map chooser tabs.

Browse Source
This commit is contained in:
Paul Chote
2025-04-28 16:16:55 +01:00
committed by Gustas Kažukauskas
parent 5b7a714ac2
commit 965a490b70
6 changed files with 80 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
OpenRA.Mods.Common/Widgets/Logic/MapChooserLogic.cs
View File

@@ -82,6 +82,15 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[FluentReference]
const string OrderMapsBySize = "options-order-maps.size";
[FluentReference]
const string SystemMapsTab = "button-mapchooser-system-maps-tab";
[FluentReference]
const string UserMapsTab = "button-mapchooser-user-maps-tab";
[FluentReference]
const string RemoteMapsTab = "button-mapchooser-remote-maps-tab";
readonly string allMaps;
readonly Widget widget;
@@ -89,6 +98,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly ModData modData;
readonly HashSet<string> remoteMapPool;
readonly ScrollItemWidget itemTemplate;
readonly MapVisibility filter;
MapClassification currentTab;
bool disposed;
@@ -96,8 +106,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
int remoteUnavailable = 0;
readonly Dictionary<MapClassification, ScrollPanelWidget> scrollpanels = [];
readonly Dictionary<MapClassification, MapPreview[]> tabMaps = [];
readonly Dictionary<MapClassification, string> tabLabels = [];
string[] visibleMaps;
string selectedUid;
@@ -116,6 +127,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.modData = modData;
this.onSelect = onSelect;
this.remoteMapPool = remoteMapPool;
this.filter = filter;
allMaps = FluentProvider.GetMessage(AllMaps);
@@ -182,8 +194,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
DeleteOneMap(selectedUid, newUid =>
{
RefreshMaps(currentTab, filter);
RefreshMaps(currentTab);
EnumerateMaps(currentTab);
SetupMapTabs();
if (tabMaps[currentTab].Length == 0)
SwitchTab(modData.MapCache[newUid].Class);
});
@@ -193,10 +206,11 @@ namespace OpenRA.Mods.Common.Widgets.Logic
deleteAllMapsButton.IsVisible = () => currentTab == MapClassification.User;
deleteAllMapsButton.OnClick = () =>
{
DeleteAllMaps(visibleMaps, (string newUid) =>
DeleteAllMaps(visibleMaps, newUid =>
{
RefreshMaps(currentTab, filter);
RefreshMaps(currentTab);
EnumerateMaps(currentTab);
SetupMapTabs();
SwitchTab(modData.MapCache[newUid].Class);
});
};
@@ -220,29 +234,37 @@ namespace OpenRA.Mods.Common.Widgets.Logic
modData.MapCache.QueryRemoteMapDetails(services.MapRepository, remoteMapPool);
}
SetupMapTab(MapClassification.User, filter, "USER_MAPS_TAB_BUTTON", "USER_MAPS_TAB");
SetupMapTab(MapClassification.System, filter, "SYSTEM_MAPS_TAB_BUTTON", "SYSTEM_MAPS_TAB");
SetupMapTab(MapClassification.Remote, filter, "REMOTE_MAPS_TAB_BUTTON", "REMOTE_MAPS_TAB");
SetupMapPanel(MapClassification.User, "USER_MAPS_TAB");
SetupMapPanel(MapClassification.System, "SYSTEM_MAPS_TAB");
SetupMapPanel(MapClassification.Remote, "REMOTE_MAPS_TAB");
// System and user map tabs are hidden when the server forces a restricted pool
if (remoteMapPool != null)
{
tabLabels[MapClassification.Remote] = RemoteMapsTab;
currentTab = MapClassification.Remote;
selectedUid = initialMap;
}
else if (initialMap == null && tabMaps.TryGetValue(initialTab, out var map) && map.Length > 0)
{
selectedUid = Game.ModData.MapCache.ChooseInitialMap(map.Select(mp => mp.Uid).First(),
Game.CosmeticRandom);
currentTab = initialTab;
}
else
{
selectedUid = Game.ModData.MapCache.ChooseInitialMap(initialMap, Game.CosmeticRandom);
currentTab = tabMaps.Keys.FirstOrDefault(k => tabMaps[k].Select(mp => mp.Uid).Contains(selectedUid));
tabLabels[MapClassification.System] = SystemMapsTab;
tabLabels[MapClassification.User] = UserMapsTab;
if (initialMap == null && tabMaps.TryGetValue(initialTab, out var map) && map.Length > 0)
{
var uid = map.Select(mp => mp.Uid).First();
selectedUid = Game.ModData.MapCache.ChooseInitialMap(uid, Game.CosmeticRandom);
currentTab = initialTab;
}
else
{
selectedUid = Game.ModData.MapCache.ChooseInitialMap(initialMap, Game.CosmeticRandom);
currentTab = tabMaps.Keys.FirstOrDefault(k => tabMaps[k].Select(mp => mp.Uid).Contains(selectedUid));
}
}
EnumerateMaps(currentTab);
SetupMapTabs();
}
void SwitchTab(MapClassification tab)
@@ -251,7 +273,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
EnumerateMaps(tab);
}
void RefreshMaps(MapClassification tab, MapVisibility filter)
void RefreshMaps(MapClassification tab)
{
if (tab != MapClassification.Remote)
tabMaps[tab] = modData.MapCache.Where(m => m.Status == MapStatus.Available &&
@@ -283,7 +305,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return;
var missingBefore = remoteSearching + remoteUnavailable;
RefreshMaps(MapClassification.Remote, filter);
RefreshMaps(MapClassification.Remote);
var missingAfter = remoteSearching + remoteUnavailable;
if (currentTab == MapClassification.Remote && missingBefore != missingAfter)
EnumerateMaps(MapClassification.Remote);
@@ -294,7 +316,27 @@ namespace OpenRA.Mods.Common.Widgets.Logic
tabMaps[tab] = [];
}
void SetupMapTab(MapClassification tab, MapVisibility filter, string tabButtonName, string tabContainerName)
void SetupMapTabs()
{
for (var i = 0; i < 3; i++)
widget.Get<ButtonWidget>($"BUTTON{i + 1}").Visible = false;
var tabCount = 0;
foreach (var kv in tabLabels)
{
var tab = kv.Key;
if (tab == MapClassification.User && tabMaps[tab].Length == 0)
continue;
var tabButton = widget.Get<ButtonWidget>($"BUTTON{++tabCount}");
tabButton.IsHighlighted = () => currentTab == tab;
tabButton.OnClick = () => SwitchTab(tab);
tabButton.Visible = true;
tabButton.Text = kv.Value;
}
}
void SetupMapPanel(MapClassification tab, string tabContainerName)
{
var tabContainer = widget.Get<ContainerWidget>(tabContainerName);
tabContainer.IsVisible = () => currentTab == tab;
@@ -302,20 +344,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
tabScrollpanel.Layout = new GridLayout(tabScrollpanel);
scrollpanels.Add(tab, tabScrollpanel);
var tabButton = widget.Get<ButtonWidget>(tabButtonName);
tabButton.IsHighlighted = () => currentTab == tab;
if (remoteMapPool != null)
{
var isRemoteTab = tab == MapClassification.Remote;
tabButton.IsVisible = () => isRemoteTab;
}
else
tabButton.IsVisible = () => tabMaps[tab].Length > 0;
tabButton.OnClick = () => SwitchTab(tab);
RefreshMaps(tab, filter);
RefreshMaps(tab);
}
void SetupGameModeDropdown(MapClassification tab, DropDownButtonWidget gameModeDropdown)

17
mods/cnc/chrome/mapchooser.yaml
View File

@@ -18,24 +18,21 @@ Container@MAPCHOOSER_PANEL:
Height: PARENT_HEIGHT
Background: panel-black
Children:
Button@SYSTEM_MAPS_TAB_BUTTON:
Button@BUTTON1:
X: 15
Y: 15
Height: 31
Width: 135
Text: button-bg-system-maps-tab
Button@REMOTE_MAPS_TAB_BUTTON:
X: 15
Y: 15
Height: 31
Width: 135
Text: button-bg-remote-maps-tab
Button@USER_MAPS_TAB_BUTTON:
Button@BUTTON2:
X: 155
Y: 15
Height: 31
Width: 135
Text: button-bg-user-maps-tab
Button@BUTTON3:
X: 295
Y: 15
Height: 31
Width: 135
Container@MAP_TAB_PANES:
Width: PARENT_WIDTH - 30
Height: PARENT_HEIGHT - 90

3
mods/cnc/fluent/chrome.ftl
View File

@@ -514,9 +514,6 @@ button-settings-title = Settings
## mapchooser.yaml
label-mapchooser-panel-title = Select Map
button-bg-system-maps-tab = Official Maps
button-bg-remote-maps-tab = Server Maps
button-bg-user-maps-tab = Custom Maps
label-filter-order-controls-desc = Filter:
label-filter-order-controls-desc-joiner = in
label-filter-order-controls-orderby = Order by:

19
mods/common/chrome/map-chooser.yaml
View File

@@ -12,26 +12,23 @@ Background@MAPCHOOSER_PANEL:
Height: 20
Text: label-mapchooser-panel-title
Font: Bold
Button@SYSTEM_MAPS_TAB_BUTTON:
Button@BUTTON1:
X: 20
Y: 48
Height: 31
Width: 140
Text: button-mapchooser-panel-system-maps-tab
Font: Bold
Button@REMOTE_MAPS_TAB_BUTTON:
X: 20
Y: 48
Height: 31
Width: 140
Text: button-mapchooser-panel-remote-maps-tab
Font: Bold
Button@USER_MAPS_TAB_BUTTON:
Button@BUTTON2:
X: 160
Y: 48
Height: 31
Width: 140
Text: button-mapchooser-panel-user-maps-tab
Font: Bold
Button@BUTTON3:
X: 300
Y: 48
Height: 31
Width: 140
Font: Bold
Container@MAP_TAB_PANES:
Width: PARENT_WIDTH - 40

3
mods/common/fluent/chrome.ftl
View File

@@ -333,9 +333,6 @@ button-settings-title = Settings
## map-chooser.yaml
label-mapchooser-panel-title = Choose Map
button-mapchooser-panel-system-maps-tab = Official Maps
button-mapchooser-panel-remote-maps-tab = Server Maps
button-mapchooser-panel-user-maps-tab = Custom Maps
label-filter-order-controls-desc = Filter:
label-filter-order-controls-desc-joiner = in
label-filter-order-controls-orderby = Order by:

4
mods/common/fluent/common.ftl
View File

@@ -545,6 +545,10 @@ options-order-maps =
.date = Date
.size = Size
button-mapchooser-system-maps-tab = Official Maps
button-mapchooser-remote-maps-tab = Server Maps
button-mapchooser-user-maps-tab = Custom Maps
## MissionBrowserLogic
dialog-no-video =
.title = Video not installed