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

50
OpenRA.Mods.Cnc/Widgets/CncMenuButton.cs
View File

@@ -23,31 +23,39 @@ namespace OpenRA.Mods.Cnc.Widgets
protected CncDropDownButtonWidget(CncDropDownButtonWidget other) : base(other) { } protected CncDropDownButtonWidget(CncDropDownButtonWidget other) : base(other) { }
public override Widget Clone() { return new CncDropDownButtonWidget(this); } public override Widget Clone() { return new CncDropDownButtonWidget(this); }
public static new void ShowDropDown<T>(Widget w, IEnumerable<T> ts, Func<T, int, LabelWidget> ft) Widget panel;
Widget fullscreenMask;
public void RemovePanel()
{ {
var dropDown = new ScrollPanelWidget(); Widget.RootWidget.RemoveChild(fullscreenMask);
dropDown.Bounds = new Rectangle(w.RenderOrigin.X, w.RenderOrigin.Y + w.Bounds.Height, w.Bounds.Width, 100); Widget.RootWidget.RemoveChild(panel);
dropDown.ItemSpacing = 1; Game.BeforeGameStart -= RemovePanel;
dropDown.Background = "panel-black"; panel = fullscreenMask = null;
}
List<LabelWidget> items = new List<LabelWidget>(); public void DisplayPanel(Widget p)
List<Widget> dismissAfter = new List<Widget>(); {
foreach (var t in ts) if (panel != null)
throw new InvalidOperationException("Attempted to attach a panel to an open dropdown");
panel = p;
// Mask to prevent any clicks from being sent to other widgets
fullscreenMask = new ContainerWidget();
fullscreenMask.Bounds = new Rectangle(0, 0, Game.viewport.Width, Game.viewport.Height);
Widget.RootWidget.AddChild(fullscreenMask);
Game.BeforeGameStart += RemovePanel;
fullscreenMask.OnMouseDown = mi =>
{ {
var ww = ft(t, dropDown.Bounds.Width - dropDown.ScrollbarWidth); RemovePanel();
dismissAfter.Add(ww); return true;
ww.OnMouseMove = mi => items.Do(lw => };
{ fullscreenMask.OnMouseUp = mi => true;
lw.Background = null;
ww.Background = "button-hover";
});
dropDown.AddChild(ww); var oldBounds = panel.Bounds;
items.Add(ww); panel.Bounds = new Rectangle(RenderOrigin.X, RenderOrigin.Y + Bounds.Height, oldBounds.Width, oldBounds.Height);
} Widget.RootWidget.AddChild(panel);
dropDown.Bounds.Height = Math.Min(150, dropDown.ContentHeight);
ShowDropPanel(w, dropDown, dismissAfter, () => true);
} }
} }
} }

8
OpenRA.Mods.Cnc/Widgets/CncSettingsLogic.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Cnc.Widgets
playerPalettePreview.Ramp = playerColor; playerPalettePreview.Ramp = playerColor;
var colorDropdown = generalPane.GetWidget<CncDropDownButtonWidget>("COLOR_DROPDOWN"); var colorDropdown = generalPane.GetWidget<CncDropDownButtonWidget>("COLOR_DROPDOWN");
colorDropdown.OnMouseUp = _ => ShowColorPicker(colorDropdown); colorDropdown.OnClick = () => ShowColorPicker(colorDropdown);
colorDropdown.GetWidget<ColorBlockWidget>("COLORBLOCK").GetColor = () => playerColor.GetColor(0); colorDropdown.GetWidget<ColorBlockWidget>("COLORBLOCK").GetColor = () => playerColor.GetColor(0);
// Debug // Debug
@@ -194,11 +194,12 @@ namespace OpenRA.Mods.Cnc.Widgets
}; };
} }
bool ShowColorPicker(Widget colorDropdown) void ShowColorPicker(CncDropDownButtonWidget color)
{ {
Action<ColorRamp> onSelect = c => Action<ColorRamp> onSelect = c =>
{ {
playerColor = c; playerColor = c;
color.RemovePanel();
}; };
Action<ColorRamp> onChange = c => Action<ColorRamp> onChange = c =>
@@ -213,8 +214,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{ "initialRamp", playerColor } { "initialRamp", playerColor }
}); });
CncDropDownButtonWidget.ShowDropPanel(colorDropdown, colorChooser, new List<Widget>() { colorChooser.GetWidget("SAVE_BUTTON") }, () => true); color.DisplayPanel(colorChooser);
return true;
} }
bool ShowGroupModifierDropdown(Widget dropdown) bool ShowGroupModifierDropdown(Widget dropdown)