Merge pull request #2481 from cwensley/curtis/wpf-toolbar-and-menu-ic…

…on-sizes Wpf: Allow ToolItem and MenuItem to have different icon sizes
picoe · May 19, 2023 · 82b5ea5 · 82b5ea5
2 parents 8fe54c2 + a20524c
commit 82b5ea5
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 10 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -98,7 +98,7 @@
 			"request": "launch",
 			"preLaunchTask": "build-wpf",
             "program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net6.0-windows/Eto.Test.Wpf.exe",
-			"targetArchitecture": "x86_64",
+			// "targetArchitecture": "x86_64",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",

diff --git a/src/Eto.Wpf/Forms/Menu/MenuItemHandler.cs b/src/Eto.Wpf/Forms/Menu/MenuItemHandler.cs
@@ -13,6 +13,13 @@ interface IMenuItemHandler
 	{
 		void Validate();
 	}
+
+	public static class MenuItemHandler
+	{
+		// note this does not affect the main menu by default due to WPF hard coding a size of 16,16 in its styles.
+		public static Size? DefaultImageSize = new Size(16, 16);
+		internal static readonly object ImageSize_Key = new object();
+	}
 
 	public class MenuItemHandler<TControl, TWidget, TCallback> : MenuHandler<TControl, TWidget, TCallback>, MenuItem.IHandler, swi.ICommand, IWpfValidateBinding, IMenuItemHandler
 		where TControl : swc.MenuItem
@@ -32,14 +39,31 @@ protected virtual void OnClick()
 		{
 			Callback.OnClick(Widget, EventArgs.Empty);
 		}
+
+		public Size? ImageSize
+		{
+			get => Widget.Properties.Get<Size?>(MenuItemHandler.ImageSize_Key, MenuItemHandler.DefaultImageSize);
+			set
+			{
+				if (Widget.Properties.TrySet(MenuItemHandler.ImageSize_Key, value, MenuItemHandler.DefaultImageSize))
+				{
+					OnImageSizeChanged();
+				}
+			}
+		}
+
+		protected virtual void OnImageSizeChanged()
+		{
+			Control.Icon = image.ToWpfImage(Screen.PrimaryScreen.LogicalPixelSize, ImageSize);
+		}
 
 		public Image Image
 		{
-			get { return image; }
+			get => image;
 			set
 			{
 				image = value;
-				Control.Icon = image.ToWpfImage(Screen.PrimaryScreen.LogicalPixelSize, new Size(16, 16));
+				OnImageSizeChanged();
 			}
 		}
 

diff --git a/src/Eto.Wpf/Forms/ToolBar/ButtonToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/ButtonToolItemHandler.cs
@@ -17,8 +17,10 @@ public class ButtonToolItemHandler : ToolItemHandler<swc.Button, ButtonToolItem>
 		public ButtonToolItemHandler ()
 		{
 			Control = new swc.Button();
-			swcImage = new swc.Image { MaxHeight = 16, MaxWidth = 16 };
+			swcImage = new swc.Image();
 			label = new swc.TextBlock();
+			label.VerticalAlignment = sw.VerticalAlignment.Center;
+			label.Margin = new Thickness(2, 0, 2, 0);
 			var panel = new swc.StackPanel { Orientation = swc.Orientation.Horizontal };
 			panel.Children.Add(swcImage);
 			panel.Children.Add(label);
@@ -27,6 +29,14 @@ public ButtonToolItemHandler ()
 			sw.Automation.AutomationProperties.SetLabeledBy(Control, label);
 		}
 
+		protected override void OnImageSizeChanged()
+		{
+			base.OnImageSizeChanged();
+			var size = ImageSize;
+			swcImage.MaxHeight = size?.Height ?? double.PositiveInfinity;
+			swcImage.MaxWidth = size?.Width ?? double.PositiveInfinity;
+		}
+
 		private void Control_Click(object sender, RoutedEventArgs e)
 		{
 			Widget.OnClick(EventArgs.Empty);

diff --git a/src/Eto.Wpf/Forms/ToolBar/CheckToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/CheckToolItemHandler.cs
@@ -18,8 +18,10 @@ public CheckToolItemHandler ()
 			Control = new swc.Primitives.ToggleButton {
 				IsThreeState = false
 			};
-			swcImage = new swc.Image { MaxHeight = 16, MaxWidth = 16 };
+			swcImage = new swc.Image();
 			label = new swc.TextBlock ();
+			label.Margin = new Thickness(2, 0, 2, 0);
+			label.VerticalAlignment = sw.VerticalAlignment.Center;
 			var panel = new swc.StackPanel { Orientation = swc.Orientation.Horizontal };
 			panel.Children.Add (swcImage);
 			panel.Children.Add (label);
@@ -32,6 +34,14 @@ public CheckToolItemHandler ()
 			sw.Automation.AutomationProperties.SetLabeledBy(Control, label);
 		}
 
+		protected override void OnImageSizeChanged()
+		{
+			base.OnImageSizeChanged();
+			var size = ImageSize;
+			swcImage.MaxHeight = size?.Height ?? double.PositiveInfinity;
+			swcImage.MaxWidth = size?.Width ?? double.PositiveInfinity;
+		}
+
 		private void Control_Click(object sender, RoutedEventArgs e)
 		{
 			Widget.OnClick(EventArgs.Empty);

diff --git a/src/Eto.Wpf/Forms/ToolBar/DropDownToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/DropDownToolItemHandler.cs
@@ -20,18 +20,29 @@ public DropDownToolItemHandler ()
 		{
 			root = new swc.MenuItem();
 			Control = new swc.Menu();
+			Control.Background = swm.Brushes.Transparent;
 			Control.Items.Add(root);
-			swcImage = new swc.Image { MaxHeight = 16, MaxWidth = 16 };
+			swcImage = new swc.Image();
 			label = new swc.TextBlock();
-			arrow = new sw.Shapes.Path { Data = swm.Geometry.Parse("M 0 0 L 3 3 L 6 0 Z"), VerticalAlignment = sw.VerticalAlignment.Center, Margin = new Thickness(8, 2, 0, 0), Fill = swm.Brushes.Black };
+			label.Margin = new Thickness(2, 0, 2, 0);
+			label.VerticalAlignment = sw.VerticalAlignment.Center;
+			arrow = new sw.Shapes.Path { Data = swm.Geometry.Parse("M 0 0 L 3 3 L 6 0 Z"), VerticalAlignment = sw.VerticalAlignment.Center, Margin = new Thickness(2, 2, 0, 0), Fill = swm.Brushes.Black };
 			var panel = new swc.StackPanel { Orientation = swc.Orientation.Horizontal, Children = { swcImage, label, arrow } };
 
 			root.Header = panel;
 			root.Click += Control_Click;
 			root.SubmenuOpened += Control_Click;
 			sw.Automation.AutomationProperties.SetLabeledBy(Control, label);
 		}
-
+
+		protected override void OnImageSizeChanged()
+		{
+			base.OnImageSizeChanged();
+			var size = ImageSize;
+			swcImage.MaxHeight = size?.Height ?? double.PositiveInfinity;
+			swcImage.MaxWidth = size?.Width ?? double.PositiveInfinity;
+		}
+
 		private void Control_Click(object sender, RoutedEventArgs e)
 		{
 			// WPF raises this event for all child items as well as the root menu, so check sender

diff --git a/src/Eto.Wpf/Forms/ToolBar/RadioToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/RadioToolItemHandler.cs
@@ -22,8 +22,10 @@ public RadioToolItemHandler()
 			{
 				IsThreeState = false
 			};
-			swcImage = new swc.Image { MaxHeight = 16, MaxWidth = 16 };
+			swcImage = new swc.Image();
 			label = new swc.TextBlock();
+			label.Margin = new Thickness(2, 0, 2, 0);
+			label.VerticalAlignment = sw.VerticalAlignment.Center;
 			var panel = new swc.StackPanel { Orientation = swc.Orientation.Horizontal };
 			panel.Children.Add(swcImage);
 			panel.Children.Add(label);
@@ -37,6 +39,15 @@ public RadioToolItemHandler()
 			sw.Automation.AutomationProperties.SetLabeledBy(Control, label);
 		}
 
+		protected override void OnImageSizeChanged()
+		{
+			base.OnImageSizeChanged();
+			var size = ImageSize;
+			swcImage.MaxHeight = size?.Height ?? double.PositiveInfinity;
+			swcImage.MaxWidth = size?.Width ?? double.PositiveInfinity;
+		}
+
+
 		private void Control_Click(object sender, RoutedEventArgs e)
 		{
 			Widget.OnClick(EventArgs.Empty);

diff --git a/src/Eto.Wpf/Forms/ToolBar/SeparatorToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/SeparatorToolItemHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using Eto.Forms;
+using sw = System.Windows;
 using swc = System.Windows.Controls;
 using swm = System.Windows.Media;
 using Eto.Drawing;
@@ -40,7 +41,7 @@ public SeparatorToolItemType Type
 				switch (value)
 				{
 					case SeparatorToolItemType.Divider:
-						control = new swc.Separator { LayoutTransform = new swm.RotateTransform(90) };
+						control = new swc.Separator { LayoutTransform = new swm.RotateTransform(90), Margin = new sw.Thickness(2, 0, 2, 0) };
 						break;
 					case SeparatorToolItemType.FlexibleSpace:
 					case SeparatorToolItemType.Space:

diff --git a/src/Eto.Wpf/Forms/ToolBar/ToolBarHandler.cs b/src/Eto.Wpf/Forms/ToolBar/ToolBarHandler.cs
@@ -9,6 +9,7 @@ public class ToolBarHandler : WidgetHandler<swc.ToolBar, Eto.Forms.ToolBar>, Eto
 		public ToolBarHandler()
 		{
 			Control = new swc.ToolBar { IsTabStop = false, Tag = this };
+			swc.ToolBarTray.SetIsLocked(Control, true);
 			swi.KeyboardNavigation.SetTabNavigation(Control, swi.KeyboardNavigationMode.Continue);
 		}
 

diff --git a/src/Eto.Wpf/Forms/ToolBar/ToolItemHandler.cs b/src/Eto.Wpf/Forms/ToolBar/ToolItemHandler.cs
@@ -5,6 +5,12 @@
 
 namespace Eto.Wpf.Forms.ToolBar
 {
+	public static class ToolItemHandler
+	{
+		public static Size? DefaultImageSize = new Size(16, 16);
+		internal static readonly object ImageSize_Key = new object();
+	}
+
 	public abstract class ToolItemHandler<TControl, TWidget> : WidgetHandler<TControl, TWidget>, ToolItem.IHandler
 		where TControl : System.Windows.UIElement
 		where TWidget : ToolItem
@@ -15,6 +21,28 @@ public abstract class ToolItemHandler<TControl, TWidget> : WidgetHandler<TContro
 
 		public abstract Image Image { get; set; }
 
+		public Size? ImageSize
+		{
+			get => Widget.Properties.Get<Size?>(ToolItemHandler.ImageSize_Key, ToolItemHandler.DefaultImageSize);
+			set
+			{
+				if (Widget.Properties.TrySet(ToolItemHandler.ImageSize_Key, value, ToolItemHandler.DefaultImageSize))
+				{
+					OnImageSizeChanged();
+				}
+			}
+		}
+
+		protected virtual void OnImageSizeChanged()
+		{
+		}
+
+		protected override void Initialize()
+		{
+			base.Initialize();
+			OnImageSizeChanged();
+		}
+
 		public abstract bool Enabled { get; set; }
 		public bool Visible
 		{