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

Double clicking a map in the chooser now selects it.

Browse Source
This commit is contained in:
Paul Chote
2013-10-28 19:33:29 +13:00
parent 773c0a0356
commit 1870e31662
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Widgets/ScrollItemWidget.cs
View File

@@ -65,9 +65,10 @@ namespace OpenRA.Widgets
return w;
}
public static ScrollItemWidget Setup(string key, ScrollItemWidget template, Func<bool> isSelected, Action onClick)
public static ScrollItemWidget Setup(string key, ScrollItemWidget template, Func<bool> isSelected, Action onClick, Action onDoubleClick)
{
var w = Setup(template, isSelected, onClick);
w.OnDoubleClick = onDoubleClick;
w.ItemKey = key;
return w;
}

8
OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
var item = ScrollItemWidget.Setup(template,
() => gameMode == ii.First,
() => { gameMode = ii.First; EnumerateMaps(); });
() => { gameMode = ii.First; EnumerateMaps(onSelect); });
item.Get<LabelWidget>("LABEL").GetText = () => showItem(ii);
return item;
};
@@ -83,10 +83,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
randomMapButton.IsDisabled = () => visibleMaps == null || visibleMaps.Count == 0;
}
EnumerateMaps();
EnumerateMaps(onSelect);
}
void EnumerateMaps()
void EnumerateMaps(Action<Map> onSelect)
{
var maps = Game.modData.AvailableMaps
.Where(kv => kv.Value.Selectable)
@@ -98,7 +98,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
foreach (var kv in maps)
{
var m = kv.Value;
var item = ScrollItemWidget.Setup(kv.Key, itemTemplate, () => m == map, () => map = m);
var item = ScrollItemWidget.Setup(kv.Key, itemTemplate, () => m == map, () => map = m, () => { Ui.CloseWindow(); onSelect(m); });
var titleLabel = item.Get<LabelWidget>("TITLE");
titleLabel.GetText = () => m.Title;

2
OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
View File

@@ -98,7 +98,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
currentSong = song;
// TODO: We leak the currentSong MusicInfo across map load, so compare the Filename instead.
var item = ScrollItemWidget.Setup(song.Filename, itemTemplate, () => currentSong.Filename == song.Filename, () => { currentSong = song; Play(); });
var item = ScrollItemWidget.Setup(song.Filename, itemTemplate, () => currentSong.Filename == song.Filename, () => { currentSong = song; Play(); }, () => {});
item.Get<LabelWidget>("TITLE").GetText = () => song.Title;
item.Get<LabelWidget>("LENGTH").GetText = () => SongLengthLabel(song);
musicList.AddChild(item);