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

Drop the ControlGroupModifier setting. Use Cmd on osx for group addition.

Browse Source
This commit is contained in:
Paul Chote
2011-05-30 17:35:06 +12:00
parent 2d43d656c2
commit 922f4754f9
4 changed files with 3 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs
View File

@@ -51,7 +51,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
var debugSettings = Game.Settings.Debug;
var graphicsSettings = Game.Settings.Graphics;
var soundSettings = Game.Settings.Sound;
var keyboardSettings = Game.Settings.Keyboard;
// Player profile
var nameTextfield = generalPane.GetWidget<TextFieldWidget>("NAME_TEXTFIELD");
@@ -136,11 +135,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
teamchatCheckbox.IsChecked = () => gameSettings.TeamChatToggle;
teamchatCheckbox.OnClick = () => gameSettings.TeamChatToggle ^= true;
var groupModifierDropdown = inputPane.GetWidget<DropDownButtonWidget>("GROUPADD_MODIFIER");
groupModifierDropdown.OnMouseDown = _ => ShowGroupModifierDropdown(groupModifierDropdown, keyboardSettings);
groupModifierDropdown.GetText = () => keyboardSettings.ControlGroupModifier.ToString();
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () =>
{
playerSettings.Name = nameTextfield.Text;
@@ -178,30 +172,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
return true;
}
bool ShowGroupModifierDropdown(DropDownButtonWidget dropdown, KeyboardSettings s)
{
var options = new Dictionary<string, Modifiers>()
{
{ "Ctrl", Modifiers.Ctrl },
{ "Alt", Modifiers.Alt },
{ "Shift", Modifiers.Shift },
// TODO: Display this as Cmd on osx once we have platform detection
{ "Meta", Modifiers.Meta }
};
Func<string, ScrollItemWidget, ScrollItemWidget> setupItem = (o, itemTemplate) =>
{
var item = ScrollItemWidget.Setup(itemTemplate,
() => s.ControlGroupModifier == options[o],
() => s.ControlGroupModifier = options[o]);
item.GetWidget<LabelWidget>("LABEL").GetText = () => o;
return item;
};
dropdown.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", 500, options.Keys.ToList(), setupItem);
return true;
}
bool ShowWindowModeDropdown(DropDownButtonWidget dropdown, GraphicSettings s)
{
var options = new Dictionary<string, WindowMode>()