Update accelerator text generation for Ctrl+-/Ctrl++

This is part of the work for issue #476.
derceg · Sep 6, 2024 · 239fb87 · 239fb87
1 parent c6ddf55
commit 239fb87
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Explorer++/Helper/Helper.cpp b/Explorer++/Helper/Helper.cpp
@@ -785,7 +785,9 @@ bool IsExtendedKey(UINT key)
 		|| key == VK_INSERT
 		|| key == VK_DELETE
 		|| key == VK_DIVIDE
-		|| key == VK_NUMLOCK)
+		|| key == VK_NUMLOCK
+		|| key == VK_ADD
+		|| key == VK_SUBTRACT)
 	// clang-format on
 	{
 		return true;

diff --git a/Explorer++/TestExplorer++/AcceleratorHelperTest.cpp b/Explorer++/TestExplorer++/AcceleratorHelperTest.cpp
@@ -28,6 +28,20 @@ TEST(AcceleratorHelperTest, BuildAcceleratorString)
 	accelerator.key = 'P';
 	acceleratorText = BuildAcceleratorString(accelerator);
 	EXPECT_EQ(acceleratorText, L"Ctrl+Shift+P");
+
+	// This should generate the string "Ctrl++" (and not something like "Ctrl+Num +").
+	accelerator = {};
+	accelerator.fVirt = FVIRTKEY | FCONTROL;
+	accelerator.key = VK_ADD;
+	acceleratorText = BuildAcceleratorString(accelerator);
+	EXPECT_EQ(acceleratorText, L"Ctrl++");
+
+	// And this should be "Ctrl+-" (not "Ctrl+Num -").
+	accelerator = {};
+	accelerator.fVirt = FVIRTKEY | FCONTROL;
+	accelerator.key = VK_SUBTRACT;
+	acceleratorText = BuildAcceleratorString(accelerator);
+	EXPECT_EQ(acceleratorText, L"Ctrl+-");
 }
 
 TEST(AcceleratorHelperTest, AcceleratorTableConversion)