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

New method for attaching panels to dropdowns. Implemented for colorpicker.

Browse Source
This commit is contained in:
Paul Chote
2011-05-17 17:41:08 +12:00
parent 85c519c073
commit e8d652ad63
3 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs
View File

@@ -395,15 +395,16 @@ namespace OpenRA.Mods.Cnc.Widgets
return true;
}
bool ShowColorDropDown(Session.Slot s, ButtonWidget color)
void ShowColorDropDown(Session.Slot s, CncDropDownButtonWidget color)
{
if (Map.Players[s.MapPlayer].LockColor)
return false;
return;
Action<ColorRamp> onSelect = c =>
{
Game.Settings.Player.ColorRamp = c;
Game.Settings.Save();
color.RemovePanel();
orderManager.IssueOrder(Order.Command("color {0}".F(c)));
};
@@ -419,8 +420,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{ "initialRamp", orderManager.LocalClient.ColorRamp }
});
CncDropDownButtonWidget.ShowDropPanel(color, colorChooser, new List<Widget>() { colorChooser.GetWidget("SAVE_BUTTON") }, () => true);
return true;
color.DisplayPanel(colorChooser);
}
void UpdatePlayerList()
@@ -502,8 +502,8 @@ namespace OpenRA.Mods.Cnc.Widgets
};
name.OnLoseFocus = () => name.OnEnterKey();
var color = template.GetWidget<ButtonWidget>("COLOR");
color.OnMouseUp = _ => ShowColorDropDown(s, color);
var color = template.GetWidget<CncDropDownButtonWidget>("COLOR");
color.OnClick = () => ShowColorDropDown(s, color);
var colorBlock = color.GetWidget<ColorBlockWidget>("COLORBLOCK");
colorBlock.GetColor = () => c.ColorRamp.GetColor(0);