Remove "Sticky Window Position" option, which is default and buggy si…

…nce v4.2.25 (2011). fix issue #107.
zufuliu · Mar 8, 2019 · f510eaf · f510eaf
1 parent 5dc8e57
commit f510eaf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 30 deletions.
diff --git a/doc/Notepad2.ini b/doc/Notepad2.ini
diff --git a/metapath/src/metapath.c b/metapath/src/metapath.c
@@ -2614,11 +2614,9 @@ void SaveWindowPosition(BOOL bSaveSettingsNow, WCHAR *pIniSectionBuf) {
 	WCHAR sectionName[96];
 	GetWindowPositionSectionName(sectionName);
 
-	//  SaveSettingsNow(): query Window Dimensions
-	if (bSaveSettingsNow) {
+	// query window dimensions when window is not minimized
+	if (bSaveSettingsNow && !IsIconic(hwndMain)) {
 		WINDOWPLACEMENT wndpl;
-
-		// GetWindowPlacement
 		wndpl.length = sizeof(WINDOWPLACEMENT);
 		GetWindowPlacement(hwndMain, &wndpl);
 

diff --git a/src/Notepad2.c b/src/Notepad2.c
@@ -201,7 +201,6 @@ typedef struct _wi {
 } WININFO;
 
 static WININFO wi;
-static BOOL bStickyWinPos;
 //BOOL	bIsAppThemed;
 
 static int cyReBar;
@@ -2384,7 +2383,6 @@ void MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) {
 
 	CheckCmd(hmenu, IDM_VIEW_REUSEWINDOW, bReuseWindow);
 	CheckCmd(hmenu, IDM_VIEW_SINGLEFILEINSTANCE, bSingleFileInstance);
-	CheckCmd(hmenu, IDM_VIEW_STICKYWINPOS, bStickyWinPos);
 	CheckCmd(hmenu, IDM_VIEW_ALWAYSONTOP, IsTopMost());
 	CheckCmd(hmenu, IDM_VIEW_MINTOTRAY, bMinimizeToTray);
 	CheckCmd(hmenu, IDM_VIEW_TRANSPARENT, bTransparentMode);
@@ -2443,7 +2441,6 @@ void MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) {
 	EnableCmd(hmenu, CMD_OPENINIFILE, i);
 
 	EnableCmd(hmenu, IDM_VIEW_REUSEWINDOW, i);
-	EnableCmd(hmenu, IDM_VIEW_STICKYWINPOS, i);
 	EnableCmd(hmenu, IDM_VIEW_SINGLEFILEINSTANCE, i);
 	EnableCmd(hmenu, IDM_VIEW_NOSAVERECENT, i);
 	EnableCmd(hmenu, IDM_VIEW_NOSAVEFINDREPL, i);
@@ -4028,15 +4025,6 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) {
 		SendWMSize(hwnd);
 		break;
 
-	case IDM_VIEW_STICKYWINPOS:
-		bStickyWinPos = !bStickyWinPos;
-		IniSetBool(INI_SECTION_NAME_FLAGS, L"StickyWindowPosition", bStickyWinPos);
-		if (bStickyWinPos) {
-			SaveWindowPosition(FALSE, NULL);
-			InfoBox(0, L"MsgStickyWinPos", IDS_STICKYWINPOS);
-		}
-		break;
-
 	case IDM_VIEW_CLEARWINPOS:
 		ClearWindowPositionHistory();
 		break;
@@ -5399,7 +5387,7 @@ void LoadSettings(void) {
 		IniSectionParse(pIniSection, pIniSectionBuf);
 
 		// ignore window position if /p was specified
-		if (!flagPosParam /*|| bStickyWinPos*/) {
+		if (!flagPosParam) {
 			wi.x	= IniSectionGetInt(pIniSection, L"WindowPosX", CW_USEDEFAULT);
 			wi.y	= IniSectionGetInt(pIniSection, L"WindowPosY", CW_USEDEFAULT);
 			wi.cx	= IniSectionGetInt(pIniSection, L"WindowSizeX", CW_USEDEFAULT);
@@ -5614,8 +5602,8 @@ void SaveWindowPosition(BOOL bSaveSettingsNow, WCHAR *pIniSectionBuf) {
 	WCHAR sectionName[96];
 	GetWindowPositionSectionName(sectionName);
 
-	// SaveSettingsNow(): query Window Dimensions
-	if (bSaveSettingsNow || bStickyWinPos) {
+	// query window dimensions when window is not minimized
+	if (bSaveSettingsNow && !IsIconic(hwndMain)) {
 		WINDOWPLACEMENT wndpl;
 		wndpl.length = sizeof(WINDOWPLACEMENT);
 		GetWindowPlacement(hwndMain, &wndpl);
@@ -5627,13 +5615,11 @@ void SaveWindowPosition(BOOL bSaveSettingsNow, WCHAR *pIniSectionBuf) {
 		wi.max = (IsZoomed(hwndMain) || (wndpl.flags & WPF_RESTORETOMAXIMIZED));
 	}
 
-	if (bStickyWinPos) {
-		IniSectionSetInt(pIniSection, L"WindowPosX", wi.x);
-		IniSectionSetInt(pIniSection, L"WindowPosY", wi.y);
-		IniSectionSetInt(pIniSection, L"WindowSizeX", wi.cx);
-		IniSectionSetInt(pIniSection, L"WindowSizeY", wi.cy);
-		IniSectionSetBoolEx(pIniSection, L"WindowMaximized", wi.max, 0);
-	}
+	IniSectionSetInt(pIniSection, L"WindowPosX", wi.x);
+	IniSectionSetInt(pIniSection, L"WindowPosY", wi.y);
+	IniSectionSetInt(pIniSection, L"WindowSizeX", wi.cx);
+	IniSectionSetInt(pIniSection, L"WindowSizeY", wi.cy);
+	IniSectionSetBoolEx(pIniSection, L"WindowMaximized", wi.max, 0);
 
 	IniSectionSetIntEx(pIniSection, L"RunDlgSizeX", cxRunDlg, 0);
 	IniSectionSetIntEx(pIniSection, L"EncodingDlgSizeX", cxEncodingDlg, 0);
@@ -6348,7 +6334,6 @@ void LoadFlags(void) {
 
 	bSingleFileInstance = IniSectionGetBool(pIniSection, L"SingleFileInstance", 1);
 	bReuseWindow = IniSectionGetBool(pIniSection, L"ReuseWindow", 0);
-	bStickyWinPos = IniSectionGetBool(pIniSection, L"StickyWindowPosition", 0);
 
 	if (!flagReuseWindow && !flagNoReuseWindow) {
 		flagNoReuseWindow = !bReuseWindow;

diff --git a/src/Notepad2.rc b/src/Notepad2.rc
@@ -575,7 +575,6 @@ BEGIN
 			MENUITEM "Minimi&ze to Tray",			IDM_VIEW_MINTOTRAY
 			MENUITEM SEPARATOR
 			MENUITEM "&Reuse Window",				IDM_VIEW_REUSEWINDOW
-			MENUITEM "Sticky Window &Position",		IDM_VIEW_STICKYWINPOS
 			MENUITEM "Clear Position &History",		IDM_VIEW_CLEARWINPOS
 		END
 		POPUP "Window Title Displa&y"
@@ -1842,7 +1841,6 @@ BEGIN
     IDS_READONLY_SAVE       """%s"" is read only. Save to a different file?"
     IDS_FILECHANGENOTIFY    "The current file has been modified by an external program. Reload?"
     IDS_FILECHANGENOTIFY2   "The current file has been deleted. Save now?"
-    IDS_STICKYWINPOS        "Sticky Window Position is enabled. Any new Notepad2 windows will use the current window placement settings."
     IDS_SAVEDSETTINGS       "The current program settings have been saved."
     IDS_CREATEINI_FAIL      "Error creating configuration file."
     IDS_WRITEINI_FAIL       "Error writing settings to configuration file."

diff --git a/src/resource.h b/src/resource.h
@@ -544,7 +544,7 @@
 #define IDM_VIEW_DEFAULT_TEXT_FONT		40421
 #define IDM_VIEW_MARKOCCURRENCES_CASE	40422
 #define IDM_VIEW_REUSEWINDOW			40423
-#define IDM_VIEW_STICKYWINPOS			40424
+// 40424
 #define IDM_VIEW_ALWAYSONTOP			40425	// Alt+T
 #define IDM_VIEW_MINTOTRAY				40426
 #define IDM_VIEW_TRANSPARENT			40427	// Ctrl+0