From c5eab9abb9aeed85fde67c09bcc0f2369a5ed974 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Thu, 5 May 2022 16:21:52 -0700
Subject: [PATCH] Make group on 'G' work correctly (and not mess up text entry)

---
 .../ApplicationView/Application.cs            | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/MatterControlLib/ApplicationView/Application.cs b/MatterControlLib/ApplicationView/Application.cs
index 3cd7efceb..212ea34fa 100644
--- a/MatterControlLib/ApplicationView/Application.cs
+++ b/MatterControlLib/ApplicationView/Application.cs
@@ -271,30 +271,6 @@ namespace MatterHackers.MatterControl
 
 							break;
 
-						case Keys.G:
-							if (view3D.Printer == null
-								|| (view3D.Printer != null && view3D.Printer.ViewState.ViewMode == PartViewMode.Model))
-							{
-								var scene = view3D.sceneContext.Scene;
-								if (scene.SelectedItem != null)
-								{
-									if (keyEvent.Shift)
-									{
-										scene.UngroupSelection();
-									}
-									else if (scene.SelectedItem is SelectionGroupObject3D
-										&& scene.SelectedItem.Children.Count > 1)
-									{
-										var group = new GroupHolesAppliedObject3D();
-										group.WrapSelectedItemAndSelect(scene);
-									}
-								}
-							}
-
-							keyEvent.Handled = true;
-							keyEvent.SuppressKeyPress = true;
-							break;
-
 						case Keys.Z:
 							if (keyEvent.Control)
 							{
@@ -619,6 +595,28 @@ namespace MatterHackers.MatterControl
 				{
 					switch (keyEvent.KeyChar)
 					{
+						case 'g':
+						case 'G':
+							if (view3D.Printer == null
+								|| (view3D.Printer != null && view3D.Printer.ViewState.ViewMode == PartViewMode.Model))
+							{
+								var scene = view3D.sceneContext.Scene;
+								if (scene.SelectedItem != null)
+								{
+									if (Keyboard.IsKeyDown(Keys.Shift))
+									{
+										scene.UngroupSelection();
+									}
+									else if (scene.SelectedItem is SelectionGroupObject3D
+										&& scene.SelectedItem.Children.Count > 1)
+									{
+										var group = new GroupHolesAppliedObject3D();
+										group.WrapSelectedItemAndSelect(scene);
+									}
+								}
+							}
+							break;
+
 						case 'w':
 						case 'W':
 							view3D.ResetView();