Remove a ScrollItem header hack

with the merge of #20218 headers no longer need to be selected
This commit is contained in:
Gustas
2022-09-16 19:09:24 +03:00
committed by Matthias Mailänder
parent 6b63114aaa
commit fe72dd4140
11 changed files with 14 additions and 7 deletions

View File

@@ -177,7 +177,7 @@ namespace OpenRA.Mods.Common.Widgets
var group = kv.Key; var group = kv.Key;
if (group.Length > 0 && headerTemplate != null) if (group.Length > 0 && headerTemplate != null)
{ {
var header = ScrollItemWidget.Setup(headerTemplate, () => true, () => { }); var header = ScrollItemWidget.Setup(headerTemplate, () => false, () => { });
header.Get<LabelWidget>("LABEL").GetText = () => group; header.Get<LabelWidget>("LABEL").GetText = () => group;
panel.AddChild(header); panel.AddChild(header);
} }

View File

@@ -103,7 +103,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void CreateActorGroup(string title, IEnumerable<ActorInfo> actors) void CreateActorGroup(string title, IEnumerable<ActorInfo> actors)
{ {
var header = ScrollItemWidget.Setup(headerTemplate, () => true, () => { }); var header = ScrollItemWidget.Setup(headerTemplate, () => false, () => { });
header.Get<LabelWidget>("LABEL").GetText = () => title; header.Get<LabelWidget>("LABEL").GetText = () => title;
actorList.AddChild(header); actorList.AddChild(header);

View File

@@ -118,7 +118,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
if (teams.Count() > 1) if (teams.Count() > 1)
{ {
var teamHeader = ScrollItemWidget.Setup(teamTemplate, () => true, () => { }); var teamHeader = ScrollItemWidget.Setup(teamTemplate, () => false, () => { });
var team = t.Key > 0 var team = t.Key > 0
? modData.Translation.GetString(TeamNumber, Translation.Arguments("team", t.Key)) ? modData.Translation.GetString(TeamNumber, Translation.Arguments("team", t.Key))
: modData.Translation.GetString(NoTeam); : modData.Translation.GetString(NoTeam);
@@ -172,7 +172,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var spectators = orderManager.LobbyInfo.Clients.Where(c => c.IsObserver).ToList(); var spectators = orderManager.LobbyInfo.Clients.Where(c => c.IsObserver).ToList();
if (spectators.Count > 0) if (spectators.Count > 0)
{ {
var spectatorHeader = ScrollItemWidget.Setup(teamTemplate, () => true, () => { }); var spectatorHeader = ScrollItemWidget.Setup(teamTemplate, () => false, () => { });
var spectatorTeam = modData.Translation.GetString(Spectators); var spectatorTeam = modData.Translation.GetString(Spectators);
spectatorHeader.Get<LabelWidget>("TEAM").GetText = () => spectatorTeam; spectatorHeader.Get<LabelWidget>("TEAM").GetText = () => spectatorTeam;

View File

@@ -730,7 +730,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var group = kv.Key; var group = kv.Key;
if (group.Length > 0) if (group.Length > 0)
{ {
var header = ScrollItemWidget.Setup(playerHeader, () => true, () => { }); var header = ScrollItemWidget.Setup(playerHeader, () => false, () => { });
header.Get<LabelWidget>("LABEL").GetText = () => group; header.Get<LabelWidget>("LABEL").GetText = () => group;
playerList.AddChild(header); playerList.AddChild(header);
} }

View File

@@ -586,7 +586,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var group = kv.Key; var group = kv.Key;
if (group.Length > 0) if (group.Length > 0)
{ {
var header = ScrollItemWidget.Setup(clientHeader, () => true, () => { }); var header = ScrollItemWidget.Setup(clientHeader, () => false, () => { });
header.Get<LabelWidget>("LABEL").GetText = () => group; header.Get<LabelWidget>("LABEL").GetText = () => group;
clientList.AddChild(header); clientList.AddChild(header);
} }
@@ -679,7 +679,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (modGames.All(Filtered)) if (modGames.All(Filtered))
continue; continue;
var header = ScrollItemWidget.Setup(headerTemplate, () => true, () => { }); var header = ScrollItemWidget.Setup(headerTemplate, () => false, () => { });
var headerTitle = modGames.First().ModLabel; var headerTitle = modGames.First().ModLabel;
header.Get<LabelWidget>("LABEL").GetText = () => headerTitle; header.Get<LabelWidget>("LABEL").GetText = () => headerTitle;

View File

@@ -3,6 +3,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE:
Background: panel-black Background: panel-black
Children: Children:
ScrollItem@HEADER: ScrollItem@HEADER:
Background: scrollheader
Width: PARENT_RIGHT - 27 Width: PARENT_RIGHT - 27
Height: 13 Height: 13
X: 2 X: 2
@@ -117,6 +118,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Background: panel-black Background: panel-black
Children: Children:
ScrollItem@HEADER: ScrollItem@HEADER:
Background: scrollheader
Width: PARENT_RIGHT - 27 Width: PARENT_RIGHT - 27
Height: 13 Height: 13
X: 2 X: 2

View File

@@ -68,6 +68,7 @@ Container@SKIRMISH_STATS:
ItemSpacing: 5 ItemSpacing: 5
Children: Children:
ScrollItem@TEAM_TEMPLATE: ScrollItem@TEAM_TEMPLATE:
Background: scrollheader
Width: PARENT_RIGHT - 27 Width: PARENT_RIGHT - 27
Height: 20 Height: 20
X: 2 X: 2

View File

@@ -68,6 +68,7 @@ Container@LOBBY_SERVERS_BIN:
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
Children: Children:
ScrollItem@HEADER_TEMPLATE: ScrollItem@HEADER_TEMPLATE:
Background: scrollheader
Width: PARENT_RIGHT - 27 Width: PARENT_RIGHT - 27
Height: 20 Height: 20
X: 2 X: 2

View File

@@ -89,6 +89,7 @@ Container@MULTIPLAYER_PANEL:
TopBottomSpacing: 2 TopBottomSpacing: 2
Children: Children:
ScrollItem@HEADER_TEMPLATE: ScrollItem@HEADER_TEMPLATE:
Background: scrollheader
Width: PARENT_RIGHT - 27 Width: PARENT_RIGHT - 27
Height: 20 Height: 20
X: 2 X: 2

View File

@@ -4,6 +4,7 @@ ScrollPanel@MULTIPLAYER_CLIENT_LIST:
IgnoreChildMouseOver: true IgnoreChildMouseOver: true
Children: Children:
ScrollItem@HEADER: ScrollItem@HEADER:
Background: scrollheader
Width: PARENT_RIGHT - 27 Width: PARENT_RIGHT - 27
Height: 13 Height: 13
X: 2 X: 2

View File

@@ -222,6 +222,7 @@ Container@REPLAYBROWSER_PANEL:
IgnoreChildMouseOver: true IgnoreChildMouseOver: true
Children: Children:
ScrollItem@HEADER: ScrollItem@HEADER:
Background: scrollheader
Width: PARENT_RIGHT - 27 Width: PARENT_RIGHT - 27
Height: 13 Height: 13
X: 2 X: 2