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

Merge pull request #8342 from LipkeGu/editor-crash-colorpicker

Browse Source 
Allow changing of player Color/Name only on main menu
This commit is contained in:
Pavel Penev
2015-06-03 14:08:30 +03:00
parent e12dc1904e a1fc77980d
commit 707c403cc3
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,6 +204,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var ps = Game.Settings.Player;
var nameTextfield = panel.Get<TextFieldWidget>("PLAYERNAME");
nameTextfield.IsDisabled = () => worldRenderer.World.Type != WorldType.Shellmap;
nameTextfield.Text = Settings.SanitizedPlayerName(ps.Name);
nameTextfield.OnEnterKey = () => { nameTextfield.YieldKeyboardFocus(); return true; };
nameTextfield.OnLoseFocus = () =>
@@ -216,6 +217,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
colorPreview.Color = ps.Color;
var colorDropdown = panel.Get<DropDownButtonWidget>("PLAYERCOLOR");
colorDropdown.IsDisabled = () => worldRenderer.World.Type != WorldType.Shellmap;
colorDropdown.OnMouseDown = _ => ColorPickerLogic.ShowColorDropDown(colorDropdown, colorPreview, worldRenderer.World);
colorDropdown.Get<ColorBlockWidget>("COLORBLOCK").GetColor = () => ps.Color.RGB;