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);

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

@@ -22,32 +22,40 @@ namespace OpenRA.Mods.Cnc.Widgets
public CncDropDownButtonWidget() : base() { }
protected CncDropDownButtonWidget(CncDropDownButtonWidget other) : base(other) { }
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();
dropDown.Bounds = new Rectangle(w.RenderOrigin.X, w.RenderOrigin.Y + w.Bounds.Height, w.Bounds.Width, 100);
dropDown.ItemSpacing = 1;
dropDown.Background = "panel-black";
List<LabelWidget> items = new List<LabelWidget>();
List<Widget> dismissAfter = new List<Widget>();
foreach (var t in ts)
{
var ww = ft(t, dropDown.Bounds.Width - dropDown.ScrollbarWidth);
dismissAfter.Add(ww);
ww.OnMouseMove = mi => items.Do(lw =>
{
lw.Background = null;
ww.Background = "button-hover";
});
dropDown.AddChild(ww);
items.Add(ww);
}
Widget.RootWidget.RemoveChild(fullscreenMask);
Widget.RootWidget.RemoveChild(panel);
Game.BeforeGameStart -= RemovePanel;
panel = fullscreenMask = null;
}
public void DisplayPanel(Widget p)
{
if (panel != null)
throw new InvalidOperationException("Attempted to attach a panel to an open dropdown");
panel = p;
dropDown.Bounds.Height = Math.Min(150, dropDown.ContentHeight);
ShowDropPanel(w, dropDown, dismissAfter, () => true);
// 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 =>
{
RemovePanel();
return true;
};
fullscreenMask.OnMouseUp = mi => true;
var oldBounds = panel.Bounds;
panel.Bounds = new Rectangle(RenderOrigin.X, RenderOrigin.Y + Bounds.Height, oldBounds.Width, oldBounds.Height);
Widget.RootWidget.AddChild(panel);
}
}
}

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

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