Merge pull request rizonesoft#492 from RaiKoHoff/Bugfixes_Release_IV

Help Menu Change
xsak · May 12, 2018 · df3e106 · df3e106
2 parents 6b5b9c9 + de77cfb
commit df3e106
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/src/Dialogs.c b/src/Dialogs.c
@@ -2631,15 +2631,14 @@ WININFO GetMyWindowPlacement(HWND hwnd, MONITORINFO* hMonitorInfo)
 {
  WINDOWPLACEMENT wndpl;
  wndpl.length = sizeof(WINDOWPLACEMENT);
-
  GetWindowPlacement(hwnd, &wndpl);
 
  WININFO wi;
  wi.x = wndpl.rcNormalPosition.left;
  wi.y = wndpl.rcNormalPosition.top;
  wi.cx = wndpl.rcNormalPosition.right - wndpl.rcNormalPosition.left;
  wi.cy = wndpl.rcNormalPosition.bottom - wndpl.rcNormalPosition.top;
- wi.max = (IsZoomed(hwnd) || (wndpl.flags & WPF_RESTORETOMAXIMIZED));
+ wi.max = IsZoomed(hwnd) || (wndpl.flags & WPF_RESTORETOMAXIMIZED);
 
  if (hMonitorInfo)
  {

diff --git a/src/Helpers.c b/src/Helpers.c
@@ -778,6 +778,7 @@ typedef struct _resizedlg {
  int mmiPtMinY;
 } RESIZEDLG, *PRESIZEDLG;
 
+
 void ResizeDlg_Init(HWND hwnd,int cxFrame,int cyFrame,int nIdGrip)
 {
  RECT rc;

diff --git a/src/Notepad3.c b/src/Notepad3.c
@@ -930,6 +930,7 @@ static void __fastcall _InitWindowPosition(HWND hwnd)
  g_WinInfo.x = mi.rcWork.right - g_WinInfo.cx - 16;
  }
  }
+
  g_WinCurrentWidth = g_WinInfo.cx;
 }
 
@@ -962,9 +963,9 @@ HWND InitInstance(HINSTANCE hInstance,LPSTR pszCmdLine,int nCmdShow)
  if (g_WinInfo.max)
  nCmdShow = SW_SHOWMAXIMIZED;
 
- if ((bAlwaysOnTop || g_flagAlwaysOnTop == 2) && g_flagAlwaysOnTop != 1)
- SetWindowPos(g_hwndMain,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);
-
+ if ((bAlwaysOnTop || g_flagAlwaysOnTop == 2) && g_flagAlwaysOnTop != 1) {
+ SetWindowPos(g_hwndMain, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+ }
  if (bTransparentMode)
  SetWindowTransparentMode(g_hwndMain,true);
 
@@ -6562,17 +6563,18 @@ void LoadSettings()
  StringCchPrintf(tchSizeY,COUNTOF(tchSizeY),L"%ix%i SizeY",ResX,ResY);
  StringCchPrintf(tchMaximized,COUNTOF(tchMaximized),L"%ix%i Maximized",ResX,ResY);
 
- g_WinInfo.x = IniSectionGetInt(pIniSection,tchPosX,CW_USEDEFAULT);
- g_WinInfo.y = IniSectionGetInt(pIniSection,tchPosY,CW_USEDEFAULT);
- g_WinInfo.cx = IniSectionGetInt(pIniSection,tchSizeX,CW_USEDEFAULT);
- g_WinInfo.cy = IniSectionGetInt(pIniSection,tchSizeY,CW_USEDEFAULT);
+ g_WinInfo.x = IniSectionGetInt(pIniSection,tchPosX,INT_MAX - 1);
+ g_WinInfo.y = IniSectionGetInt(pIniSection,tchPosY, INT_MAX - 1);
+ g_WinInfo.cx = IniSectionGetInt(pIniSection,tchSizeX, INT_MAX - 1);
+ g_WinInfo.cy = IniSectionGetInt(pIniSection,tchSizeY, INT_MAX - 1);
  g_WinInfo.max = IniSectionGetInt(pIniSection,tchMaximized,0);
  if (g_WinInfo.max) g_WinInfo.max = 1;
 
- if (((g_WinInfo.x & ~CW_USEDEFAULT) == 0) ||
- ((g_WinInfo.y & ~CW_USEDEFAULT) == 0) ||
- ((g_WinInfo.cx & ~CW_USEDEFAULT) == 0) ||
- ((g_WinInfo.cy & ~CW_USEDEFAULT) == 0)) {
+
+ if (((g_WinInfo.x & ~CW_USEDEFAULT) == (INT_MAX - 1)) ||
+ ((g_WinInfo.y & ~CW_USEDEFAULT) == (INT_MAX - 1)) ||
+ ((g_WinInfo.cx & ~CW_USEDEFAULT) == (INT_MAX - 1)) ||
+ ((g_WinInfo.cy & ~CW_USEDEFAULT) == (INT_MAX - 1))) {
  g_flagDefaultPos = 2;
  }
  }

diff --git a/src/Notepad3.rc b/src/Notepad3.rc
@@ -136,7 +136,7 @@ BEGIN
  MENUITEM "&Add Current File...\tAlt+K", IDM_FILE_ADDTOFAV
  MENUITEM "&Manage...\tAlt+F9", IDM_FILE_MANAGEFAV
  END
- MENUITEM "Recent (&History)...\tAlt+H", IDM_FILE_RECENT
+ MENUITEM "Recent (&History)...\tCtrl+Alt+H", IDM_FILE_RECENT
  MENUITEM SEPARATOR
  MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT
  END
@@ -308,7 +308,7 @@ BEGIN
  MENUITEM "Show Line &Endings\tCtrl+Shift+9", IDM_VIEW_SHOWEOLS
  MENUITEM "Show Wra&p Symbols\tCtrl+Shift+0", IDM_VIEW_WORDWRAPSYMBOLS
  MENUITEM SEPARATOR
- MENUITEM "H&yperlink Hotspots\tCtrl+Alt+H", IDM_VIEW_HYPERLINKHOTSPOTS
+ MENUITEM "H&yperlink Hotspots\tCtrl+Alt+W", IDM_VIEW_HYPERLINKHOTSPOTS
  MENUITEM "&Visual Brace Matching\tCtrl+Shift+V", IDM_VIEW_MATCHBRACES
  MENUITEM "Hi&ghlight Current Line\tCtrl+Shift+I", IDM_VIEW_HILITECURRENTLINE
  POPUP "Mar&k Occurrences"
@@ -390,7 +390,7 @@ BEGIN
  MENUITEM "Save Settings &Now\tF7", IDM_VIEW_SAVESETTINGSNOW
  MENUITEM "&Open Settings File\tCtrl+F7", CMD_OPENINIFILE
  END
- POPUP "&?"
+ POPUP "&Help"
  BEGIN
  MENUITEM "&Online Documentation\tF1", IDM_HELP_ONLINEDOCUMENTATION
  MENUITEM SEPARATOR
@@ -479,9 +479,8 @@ BEGIN
  "G", IDM_VIEW_SHOWINDENTGUIDES, VIRTKEY, SHIFT, CONTROL, NOINVERT
  "G", IDM_VIEW_TRANSPARENT, VIRTKEY, ALT, NOINVERT
  "H", IDM_EDIT_REPLACE, VIRTKEY, CONTROL, NOINVERT
- "H", IDM_FILE_RECENT, VIRTKEY, ALT, NOINVERT
+ "H", IDM_FILE_RECENT, VIRTKEY, CONTROL, ALT, NOINVERT
  "H", IDM_VIEW_AUTOCLOSETAGS, VIRTKEY, SHIFT, CONTROL, NOINVERT
- "H", IDM_VIEW_HYPERLINKHOTSPOTS, VIRTKEY, CONTROL, ALT, NOINVERT
  "I", IDM_EDIT_SPLITLINES, VIRTKEY, CONTROL, NOINVERT
  "I", IDM_FILE_OPENFAV, VIRTKEY, ALT, NOINVERT
  "I", IDM_EDIT_TITLECASE, VIRTKEY, CONTROL, ALT, NOINVERT
@@ -534,6 +533,7 @@ BEGIN
  "W", IDM_VIEW_WORDWRAP, VIRTKEY, CONTROL, NOINVERT
  "W", IDM_EDIT_TRIMLINES, VIRTKEY, ALT, NOINVERT
  "W", IDM_EDIT_COLUMNWRAP, VIRTKEY, SHIFT, CONTROL, NOINVERT
+ "W", IDM_VIEW_HYPERLINKHOTSPOTS, VIRTKEY, CONTROL, ALT, NOINVERT
  "X", IDM_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT
  "X", IDM_EDIT_INSERT_TAG, VIRTKEY, ALT, NOINVERT
  "X", IDM_EDIT_CHAR2HEX, VIRTKEY, CONTROL, ALT, NOINVERT

diff --git a/test/TestAhkNotepad3.ahk b/test/TestAhkNotepad3.ahk
@@ -89,7 +89,7 @@ CHECK_ABOUT_BOX:
 WinActivate, ahk_pid %v_Notepad3_PID%
 
 ; This will select File->Open in Notepad:
-WinMenuSelectItem, ahk_pid %v_Notepad3_PID%, , ?, About...
+WinMenuSelectItem, ahk_pid %v_Notepad3_PID%, , Help, About...
 
 WinWait, About %v_NP3Name%, , 1
 v_ErrLevel = %ErrorLevel%