Merge pull request #2136 from cwensley/curtis/windows-parent-focus-co…

…ntinued Wpf/WinForms: Focus parent for all dialogs
picoe · Feb 3, 2022 · 28d947e · 28d947e
2 parents a4593db + 01e2b75
commit 28d947e
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 3 deletions.
diff --git a/src/Eto.WinForms/Forms/ColorDialogHandler.cs b/src/Eto.WinForms/Forms/ColorDialogHandler.cs
@@ -33,6 +33,9 @@ public DialogResult ShowDialog(Window parent)
 			swf.DialogResult result;
 			if (customColors != null) Control.CustomColors = customColors;
 
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 			if (parent != null)
 				result = Control.ShowDialog(parent.GetContainerControl());
 			else

diff --git a/src/Eto.WinForms/Forms/FontDialogHandler.cs b/src/Eto.WinForms/Forms/FontDialogHandler.cs
@@ -58,6 +58,9 @@ public Font Font
 
 		public DialogResult ShowDialog(Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 			var result = Control.ShowDialog();
 			if (result == swf.DialogResult.OK)
 			{

diff --git a/src/Eto.WinForms/Forms/MessageBoxHandler.cs b/src/Eto.WinForms/Forms/MessageBoxHandler.cs
@@ -19,7 +19,11 @@ public class MessageBoxHandler : WidgetHandler<Widget>, MessageBox.IHandler
 
 		public DialogResult ShowDialog(Control parent)
 		{
-			var caption = Caption ?? ((parent != null && parent.ParentWindow != null) ? parent.ParentWindow.Title : null);
+			var parentWindow = parent?.ParentWindow;
+			if (parentWindow?.HasFocus == false)
+				parentWindow.Focus();
+
+			var caption = Caption ?? parentWindow?.Title;
 			swf.Control c = (parent == null) ? null : (swf.Control)parent.ControlObject;
 			swf.DialogResult result = swf.MessageBox.Show(c, Text, caption, Convert(Buttons), Convert(Type), Convert(DefaultButton, Buttons));
 			return result.ToEto();

diff --git a/src/Eto.WinForms/Forms/Printing/PrintDialogHandler.cs b/src/Eto.WinForms/Forms/Printing/PrintDialogHandler.cs
@@ -22,6 +22,9 @@ public PrintDialogHandler()
 
 		public DialogResult ShowDialog(Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 			swf.DialogResult result;
 
 			Control.PrinterSettings = _printSettings.ToSD();

diff --git a/src/Eto.WinForms/Forms/Printing/PrintPreviewDialogHandler.cs b/src/Eto.WinForms/Forms/Printing/PrintPreviewDialogHandler.cs
@@ -58,6 +58,9 @@ public PrintSettings PrintSettings
 
 		public DialogResult ShowDialog(Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 			swf.DialogResult result;
 			Control.Document = PrintDocumentHandler.GetControl(Document);
 

diff --git a/src/Eto.WinForms/Forms/SelectFolderDialogHandler.cs b/src/Eto.WinForms/Forms/SelectFolderDialogHandler.cs
@@ -14,6 +14,9 @@ public SelectFolderDialogHandler ()
 
 		public DialogResult ShowDialog (Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 			SWF.DialogResult dr;
 			if (parent != null) dr = Control.ShowDialog((SWF.IWin32Window)parent.ControlObject);
 			else dr = Control.ShowDialog();

diff --git a/src/Eto.WinForms/Forms/WindowsFileDialog.cs b/src/Eto.WinForms/Forms/WindowsFileDialog.cs
@@ -88,6 +88,9 @@ public string Title
 
 		public DialogResult ShowDialog(Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 			SetFilters();
 
 			swf.DialogResult dr;

diff --git a/src/Eto.Wpf/Forms/ColorDialogHandler.cs b/src/Eto.Wpf/Forms/ColorDialogHandler.cs
@@ -91,6 +91,8 @@ public DialogResult ShowDialog(Window parent)
 		{
 			if (parent != null)
 			{
+				if (!parent.HasFocus)
+					parent.Focus();
 				var owner = parent.ControlObject as sw.Window;
 				Control.Owner = owner;
 				Control.WindowStartupLocation = sw.WindowStartupLocation.CenterOwner;

diff --git a/src/Eto.Wpf/Forms/FontDialogHandler.cs b/src/Eto.Wpf/Forms/FontDialogHandler.cs
@@ -98,6 +98,8 @@ public DialogResult ShowDialog(Window parent)
 		{
 			if (parent != null)
 			{
+				if (!parent.HasFocus)
+					parent.Focus();
 				var owner = parent.ControlObject as sw.Window;
 				Control.Owner = owner;
 				Control.WindowStartupLocation = sw.WindowStartupLocation.CenterOwner;

diff --git a/src/Eto.Wpf/Forms/MessageBoxHandler.cs b/src/Eto.Wpf/Forms/MessageBoxHandler.cs
@@ -22,13 +22,17 @@ public DialogResult ShowDialog(Control parent)
 		{
 			using (var visualStyles = new EnableThemingInScope(ApplicationHandler.EnableVisualStyles))
 			{
+				var parentWindow = parent?.ParentWindow;
+				if (parentWindow?.HasFocus == false)
+					parentWindow.Focus();
+
 				var element = parent == null ? null : parent.GetContainerControl();
 				var window = element == null ? null : element.GetVisualParent<sw.Window>();
 				sw.MessageBoxResult result;
 				var buttons = Convert(Buttons);
 				var defaultButton = Convert(DefaultButton, Buttons);
 				var icon = Convert(Type);
-				var caption = Caption ?? ((parent != null && parent.ParentWindow != null) ? parent.ParentWindow.Title : null);
+				var caption = Caption ?? parentWindow?.Title;
 				if (window != null) result = WpfMessageBox.Show(window, Text, caption, buttons, icon, defaultButton);
 				else result = WpfMessageBox.Show(Text, caption, buttons, icon, defaultButton);
 				WpfFrameworkElementHelper.ShouldCaptureMouse = false;

diff --git a/src/Eto.Wpf/Forms/Printing/PrintDialogHandler.cs b/src/Eto.Wpf/Forms/Printing/PrintDialogHandler.cs
@@ -19,6 +19,9 @@ public PrintDialogHandler()
 
 		public DialogResult ShowDialog(Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 			Control.SetEtoSettings(settings);
 			var result = Control.ShowDialog();
 			WpfFrameworkElementHelper.ShouldCaptureMouse = false;

diff --git a/src/Eto.Wpf/Forms/Printing/PrintPreviewDialogHandler.cs b/src/Eto.Wpf/Forms/Printing/PrintPreviewDialogHandler.cs
@@ -41,6 +41,9 @@ protected override void Initialize()
 
 		public DialogResult ShowDialog(Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 			var print = new swc.PrintDialog();
 			print.SetEtoSettings(PrintSettings);
 			Control.Owner = parent?.ToNative();

diff --git a/src/Eto.Wpf/Forms/SelectFolderDialogHandler.cs b/src/Eto.Wpf/Forms/SelectFolderDialogHandler.cs
@@ -13,7 +13,10 @@ public SelectFolderDialogHandler ()
 
 		public DialogResult ShowDialog (Window parent)
 		{
-			var dr = Control.ShowDialog ();
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
+			var dr = Control.ShowDialog();
 			WpfFrameworkElementHelper.ShouldCaptureMouse = false;
 			return dr == swf.DialogResult.OK ? DialogResult.Ok : DialogResult.Cancel;
 		}

diff --git a/src/Eto.Wpf/Forms/VistaSelectFolderDialogHandler.cs b/src/Eto.Wpf/Forms/VistaSelectFolderDialogHandler.cs
@@ -20,6 +20,9 @@ public VistaSelectFolderDialogHandler()
 
 		public DialogResult ShowDialog(Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
+
 #if WINFORMS
 			// use reflection since adding a parameter requires us to reference PresentationFramework which we don't want in winforms
 			cp.CommonFileDialogResult result;

diff --git a/src/Eto.Wpf/Forms/WpfFileDialog.cs b/src/Eto.Wpf/Forms/WpfFileDialog.cs
@@ -67,6 +67,8 @@ from ex in f.Extensions
 
 		public override DialogResult ShowDialog(Window parent)
 		{
+			if (parent?.HasFocus == false)
+				parent.Focus();
 			SetFilters();
 			return base.ShowDialog(parent);
 		}