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

Remove a ScrollItem header hack

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs
View File

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

2
OpenRA.Mods.Common/Widgets/Logic/EncyclopediaLogic.cs
View File

@@ -103,7 +103,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
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;
actorList.AddChild(header);

4
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
View File

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

2
OpenRA.Mods.Common/Widgets/Logic/ReplayBrowserLogic.cs
View File

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

4
OpenRA.Mods.Common/Widgets/Logic/ServerListLogic.cs
View File

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

2
mods/cnc/chrome/dialogs.yaml
View File

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

1
mods/cnc/chrome/ingame-infostats.yaml
View File

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

1
mods/cnc/chrome/lobby-servers.yaml
View File

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

1
mods/cnc/chrome/multiplayer-browser.yaml
View File

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

1
mods/cnc/chrome/multiplayer-browserpanels.yaml
View File

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

1
mods/cnc/chrome/replaybrowser.yaml
View File

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