Remove Ctrl-Arrow Navigation submenu #284

Author: cshnik

src/Notepad2.c

@@ -2181,8 +2181,7 @@ void MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
   CheckCmd(hmenu, ID_SETTINGS_EVAL_SELECTION, iEvaluateMathExpression == EEM_SELECTION);
   CheckCmd(hmenu, ID_SETTINGS_EVAL_LINE, iEvaluateMathExpression == EEM_LINE);
   // [2e]: ctrl + arrow behavior toggle #89
-  CheckCmd(hmenu, ID_SETTINGS_WORD_NAVIGATION_STANDARD, iWordNavigationMode == WNM_STANDARD);
-  CheckCmd(hmenu, ID_SETTINGS_WORD_NAVIGATION_ACCELERATED, iWordNavigationMode == WNM_ACCELERATED);
+  CheckCmd(hmenu, ID_SETTINGS_WORD_NAVIGATION, iWordNavigationMode == WNM_ACCELERATED);
   // [/2e]
 }
 
@@ -4470,13 +4469,8 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
 
 
     // [2e]: ctrl + arrow behavior toggle #89
-    case ID_SETTINGS_WORD_NAVIGATION_STANDARD:
-      iWordNavigationMode = WNM_STANDARD;
-      SendMessage(hwndEdit, SCI_SETWORDNAVIGATIONMODE, iWordNavigationMode, 0);
-      break;
-
-    case ID_SETTINGS_WORD_NAVIGATION_ACCELERATED:
-      iWordNavigationMode = WNM_ACCELERATED;
+    case ID_SETTINGS_WORD_NAVIGATION:
+      iWordNavigationMode = (iWordNavigationMode == WNM_STANDARD) ? WNM_ACCELERATED : WNM_STANDARD;
       SendMessage(hwndEdit, SCI_SETWORDNAVIGATIONMODE, iWordNavigationMode, 0);
       break;
     // [/2e]

src/Notepad2.rc

@@ -342,11 +342,7 @@ BEGIN
             MENUITEM "Current &Selection",          ID_SETTINGS_EVAL_SELECTION
             MENUITEM "Current Selection or &Line",  ID_SETTINGS_EVAL_LINE
         END
-        POPUP "&Ctrl+Arrow Navigation"
-        BEGIN
-            MENUITEM "&Standard",                   ID_SETTINGS_WORD_NAVIGATION_STANDARD
-            MENUITEM "&Accelerated",                ID_SETTINGS_WORD_NAVIGATION_ACCELERATED
-        END
+        MENUITEM "Accelerated &Ctrl-Arrow Navigation", ID_SETTINGS_WORD_NAVIGATION
         MENUITEM "C&trl+Wheel Scroll",          ID_SETTINGS_CTRL_WHEEL_SCROLL
         MENUITEM "Move Caret On Ri&ght Click",  ID_SETTINGS_MOVE_CARET_ON_RCLICK
         MENUITEM "Sa&ve Before Running Tools",  IDM_VIEW_SAVEBEFORERUNNINGTOOLS

src/resource.h

@@ -27,8 +27,7 @@
 #define ID_SETTINGS_EVAL_DISABLED       51
 #define ID_SETTINGS_EVAL_SELECTION      52
 #define ID_SETTINGS_EVAL_LINE           53
-#define ID_SETTINGS_WORD_NAVIGATION_STANDARD  54
-#define ID_SETTINGS_WORD_NAVIGATION_ACCELERATED  55
+#define ID_SETTINGS_WORD_NAVIGATION     54
 #define IDM_FILE_OPENFOLDER             56
 #define ID_SAVEONLOSEFOCUS_DISABLED     57
 #define ID_SAVEONLOSEFOCUS_ENABLED 58