Add dedicated type for OperationGroup buttons

MatterControlLib/ApplicationView/Themes/ThemeConfig.cs

@@ -410,7 +410,7 @@ namespace MatterHackers.MatterControl
 			return popupMenu;
 		}
 
-		public PopupMenuButton CreateSplitButton(SplitButtonParams buttonParams)
+		public PopupMenuButton CreateSplitButton(SplitButtonParams buttonParams, OperationGroup operationGroup = null)
 		{
 			PopupMenuButton menuButton = null;
 
@@ -428,23 +428,33 @@ namespace MatterHackers.MatterControl
 			// Remove right Padding for drop style
 			innerButton.Padding = innerButton.Padding.Clone(right: 0);
 
-			menuButton = new PopupMenuButton(innerButton, this)
-			{
-				DynamicPopupContent = () =>
-				{
-					var popupMenu = new PopupMenu(ApplicationController.Instance.MenuTheme);
-					buttonParams.ExtendPopupMenu?.Invoke(popupMenu);
 
-					return popupMenu;
+			if (operationGroup == null)
-				},
+			{
-				Name = buttonParams.ButtonName + " Menu SplitButton",
+				menuButton = new PopupMenuButton(innerButton, this);
-				BackgroundColor = this.ToolbarButtonBackground,
+			}
-				HoverColor = this.ToolbarButtonHover,
+			else
-				MouseDownColor = this.ToolbarButtonDown,
+
-				DrawArrow = true,
+			{
-				Margin = this.ButtonSpacing,
+				menuButton = new OperationGroupButton(operationGroup, innerButton, this);
+			}
+
+			menuButton.DynamicPopupContent = () =>
+			{
+				var popupMenu = new PopupMenu(ApplicationController.Instance.MenuTheme);
+				buttonParams.ExtendPopupMenu?.Invoke(popupMenu);
+
+				return popupMenu;
 			};
 
+			menuButton.Name = buttonParams.ButtonName + " Menu SplitButton";
+			menuButton.BackgroundColor = this.ToolbarButtonBackground;
+			menuButton.HoverColor = this.ToolbarButtonHover;
+			menuButton.MouseDownColor = this.ToolbarButtonDown;
+			menuButton.DrawArrow = true;
+			menuButton.Margin = this.ButtonSpacing;
+			menuButton.DistinctPopupButton = true;
+
 			innerButton.Selectable = true;
 			return menuButton;
 		}

MatterControlLib/PartPreviewWindow/OperationGroupButton.cs

@@ -0,0 +1,45 @@
+/*
+Copyright (c) 2019, Lars Brubaker, John Lewin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
+*/
+
+using MatterHackers.Agg;
+using MatterHackers.Agg.UI;
+
+namespace MatterHackers.MatterControl.PartPreviewWindow
+{
+	public class OperationGroupButton : PopupMenuButton
+	{
+		private OperationGroup operationGroup;
+
+		public OperationGroupButton(OperationGroup operationGroup, GuiWidget innerButton, ThemeConfig theme)
+			: base(innerButton, theme)
+		{
+			this.operationGroup = operationGroup;
+		}
+	}
+}

MatterControlLib/PartPreviewWindow/OperationIconButton.cs

@@ -0,0 +1,54 @@
+/*
+Copyright (c) 2019, Lars Brubaker, John Lewin
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
+*/
+
+using MatterHackers.Agg.UI;
+using MatterHackers.MatterControl.CustomWidgets;
+
+namespace MatterHackers.MatterControl.PartPreviewWindow
+{
+	public class OperationIconButton : IconButton
+	{
+		private SceneSelectionOperation sceneOperation;
+		private ISceneContext sceneContext;
+
+		public OperationIconButton(SceneSelectionOperation sceneOperation, ISceneContext sceneContext, ThemeConfig theme)
+			: base(sceneOperation.Icon(theme.InvertIcons), theme)
+		{
+			this.sceneOperation = sceneOperation;
+			this.sceneContext = sceneContext;
+		}
+
+		protected override void OnClick(MouseEventArgs mouseEvent)
+		{
+			sceneOperation.Action?.Invoke(sceneContext);
+
+			base.OnClick(mouseEvent);
+		}
+	}
+}

MatterControlLib/PartPreviewWindow/ViewControls3D.cs

@@ -308,45 +308,47 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
 					PopupMenuButton groupButton = null;
 
-					groupButton = theme.CreateSplitButton(new SplitButtonParams()
+					groupButton = theme.CreateSplitButton(
-					{
+						new SplitButtonParams()
-						Icon = defaultOperation.Icon(theme.InvertIcons),
-						DefaultAction = (menuButton) =>
 						{
-							defaultOperation.Action.Invoke(sceneContext);
+							Icon = defaultOperation.Icon(theme.InvertIcons),
-						},
+							DefaultAction = (menuButton) =>
-						DefaultActionTooltip = defaultOperation.HelpText ?? defaultOperation.Title,
-						ButtonName = defaultOperation.Title,
-						ExtendPopupMenu = (PopupMenu popupMenu) =>
-						{
-							foreach (var operation in operationGroup.Operations)
 							{
-								var operationMenu = popupMenu.CreateMenuItem(operation.Title, operation.Icon?.Invoke(theme.InvertIcons));
+								defaultOperation.Action.Invoke(sceneContext);
-
+							},
-								operationMenu.ToolTipText = operation.HelpText;
+							DefaultActionTooltip = defaultOperation.HelpText ?? defaultOperation.Title,
-								operationMenu.Enabled = operation.IsEnabled(sceneContext);
+							ButtonName = defaultOperation.Title,
-								operationMenu.Click += (s, e) => UiThread.RunOnIdle(() =>
+							ExtendPopupMenu = (PopupMenu popupMenu) =>
+							{
+								foreach (var operation in operationGroup.Operations)
 								{
-									if (operationGroup.StickySelection
+									var operationMenu = popupMenu.CreateMenuItem(operation.Title, operation.Icon?.Invoke(theme.InvertIcons));
-										&& defaultOperation != operation)
+
+									operationMenu.ToolTipText = operation.HelpText;
+									operationMenu.Enabled = operation.IsEnabled(sceneContext);
+									operationMenu.Click += (s, e) => UiThread.RunOnIdle(() =>
 									{
-										// Update button
+										if (operationGroup.StickySelection
-										var iconButton = groupButton.Children.OfType<IconButton>().First();
+											&& defaultOperation != operation)
-										iconButton.SetIcon(operation.Icon(theme.InvertIcons));
+										{
-										iconButton.ToolTipText = operation.HelpText ?? operation.Title;
+											// Update button
+											var iconButton = groupButton.Children.OfType<IconButton>().First();
+											iconButton.SetIcon(operation.Icon(theme.InvertIcons));
+											iconButton.ToolTipText = operation.HelpText ?? operation.Title;
 
-										UserSettings.Instance.set(operationGroup.GroupRecordId, operationGroup.Operations.IndexOf(operation).ToString());
+											UserSettings.Instance.set(operationGroup.GroupRecordId, operationGroup.Operations.IndexOf(operation).ToString());
 
-										defaultOperation = operation;
+											defaultOperation = operation;
 
-										iconButton.Invalidate();
+											iconButton.Invalidate();
-									}
+										}
 
-									operation.Action?.Invoke(sceneContext);
+										operation.Action?.Invoke(sceneContext);
-								});
+									});
+								}
 							}
-						}
+						},
-					});
+						operationGroup);
 
 					button = groupButton;
 				}