Add "Sticky Window Position" menu, issue zufuliu#280.

RaiKoHoff · Apr 24, 2021 · 68a89b6 · 68a89b6
1 parent 1063ee1
commit 68a89b6
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 3 deletions.
diff --git a/locale/de/Notepad2.rc b/locale/de/Notepad2.rc
@@ -626,6 +626,7 @@ BEGIN
 			MENUITEM "Minimi&ze to Tray",			IDM_VIEW_MINTOTRAY
 			MENUITEM SEPARATOR
 			MENUITEM "&Reuse Window",				IDM_VIEW_REUSEWINDOW
+			MENUITEM "&Sticky Window Position",		IDM_VIEW_STICKY_WINDOW_POSITION
 			MENUITEM "Clear Position &History",		IDM_VIEW_CLEARWINPOS
 		END
 		POPUP "Window Title Displa&y"

diff --git a/locale/it/Notepad2.rc b/locale/it/Notepad2.rc
@@ -626,6 +626,7 @@ BEGIN
 			MENUITEM "Minimi&ze to Tray",			IDM_VIEW_MINTOTRAY
 			MENUITEM SEPARATOR
 			MENUITEM "&Reuse Window",				IDM_VIEW_REUSEWINDOW
+			MENUITEM "&Sticky Window Position",		IDM_VIEW_STICKY_WINDOW_POSITION
 			MENUITEM "Clear Position &History",		IDM_VIEW_CLEARWINPOS
 		END
 		POPUP "Window Title Displa&y"

diff --git a/locale/ja/Notepad2.rc b/locale/ja/Notepad2.rc
@@ -626,6 +626,7 @@ BEGIN
 			MENUITEM "システムトレイに最小化(&Z)",			IDM_VIEW_MINTOTRAY
 			MENUITEM SEPARATOR
 			MENUITEM "新しいウィンドウを開かない(&R)",				IDM_VIEW_REUSEWINDOW
+			MENUITEM "&Sticky Window Position",		IDM_VIEW_STICKY_WINDOW_POSITION
 			MENUITEM "ウィンドウ位置の履歴を消去(&H)",		IDM_VIEW_CLEARWINPOS
 		END
 		POPUP "タイトルバーの表示名(&Y)"

diff --git a/locale/ko/Notepad2.rc b/locale/ko/Notepad2.rc
@@ -626,6 +626,7 @@ BEGIN
 			MENUITEM "트레이로 최소화(&Z)",			IDM_VIEW_MINTOTRAY
 			MENUITEM SEPARATOR
 			MENUITEM "창 재사용(&R)",				IDM_VIEW_REUSEWINDOW
+			MENUITEM "&Sticky Window Position",		IDM_VIEW_STICKY_WINDOW_POSITION
 			MENUITEM "창 위치 사용 내역 지우기(&H)",		IDM_VIEW_CLEARWINPOS
 		END
 		POPUP "창 제목 표시(&Y)"

diff --git a/locale/zh-Hans/Notepad2.rc b/locale/zh-Hans/Notepad2.rc
@@ -626,6 +626,7 @@ BEGIN
 			MENUITEM "最小化到托盘(&Z)",			IDM_VIEW_MINTOTRAY
 			MENUITEM SEPARATOR
 			MENUITEM "重用窗口(&R)",				IDM_VIEW_REUSEWINDOW
+			MENUITEM "固定窗口位置(&S)",			IDM_VIEW_STICKY_WINDOW_POSITION
 			MENUITEM "清除位置记录(&H)",			IDM_VIEW_CLEARWINPOS
 		END
 		POPUP "窗口标题显示(&Y)"

diff --git a/locale/zh-Hant/Notepad2.rc b/locale/zh-Hant/Notepad2.rc
@@ -626,6 +626,7 @@ BEGIN
 			MENUITEM "最小化到托盤(&Z)",			IDM_VIEW_MINTOTRAY
 			MENUITEM SEPARATOR
 			MENUITEM "重用視窗(&R)",				IDM_VIEW_REUSEWINDOW
+			MENUITEM "固定視窗位置(&S)",			IDM_VIEW_STICKY_WINDOW_POSITION
 			MENUITEM "清除位置記錄(&H)",			IDM_VIEW_CLEARWINPOS
 		END
 		POPUP "視窗標題顯示(&Y)"

diff --git a/src/Notepad2.c b/src/Notepad2.c
@@ -345,6 +345,7 @@ static int	flagNoReuseWindow		= 0;
 static int	flagReuseWindow			= 0;
 static BOOL bSingleFileInstance		= TRUE;
 static BOOL bReuseWindow			= FALSE;
+static BOOL bStickyWindowPosition	= FALSE;
 static int	flagMultiFileArg		= 0;
 static int	flagSingleFileInstance	= 1;
 static int	flagStartAsTrayIcon		= 0;
@@ -2553,6 +2554,8 @@ void MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) {
 	CheckCmd(hmenu, IDM_VIEW_HIGHLIGHTCURRENTLINE_SUBLINE, bHighlightCurrentSubLine);
 
 	CheckCmd(hmenu, IDM_VIEW_REUSEWINDOW, bReuseWindow);
+	CheckCmd(hmenu, IDM_VIEW_STICKY_WINDOW_POSITION, bStickyWindowPosition);
+	EnableCmd(hmenu, IDM_VIEW_CLEARWINPOS, !bStickyWindowPosition);
 	CheckCmd(hmenu, IDM_VIEW_SINGLEFILEINSTANCE, bSingleFileInstance);
 	CheckCmd(hmenu, IDM_VIEW_ALWAYSONTOP, IsTopMost());
 	CheckCmd(hmenu, IDM_VIEW_MINTOTRAY, bMinimizeToTray);
@@ -2613,6 +2616,7 @@ void MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) {
 	EnableCmd(hmenu, CMD_OPENINIFILE, i);
 
 	EnableCmd(hmenu, IDM_VIEW_REUSEWINDOW, i);
+	EnableCmd(hmenu, IDM_VIEW_STICKY_WINDOW_POSITION, i);
 	EnableCmd(hmenu, IDM_VIEW_SINGLEFILEINSTANCE, i);
 	EnableCmd(hmenu, IDM_VIEW_NOSAVERECENT, i);
 	EnableCmd(hmenu, IDM_VIEW_NOSAVEFINDREPL, i);
@@ -4192,6 +4196,14 @@ LRESULT MsgCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) {
 		ClearWindowPositionHistory();
 		break;
 
+	case IDM_VIEW_STICKY_WINDOW_POSITION:
+		if (!bStickyWindowPosition) {
+			SaveSettingsNow(FALSE, TRUE);
+		}
+		bStickyWindowPosition = !bStickyWindowPosition;
+		IniSetBoolEx(INI_SECTION_NAME_FLAGS, L"StickyWindowPosition", bStickyWindowPosition, 0);
+		break;
+
 	case IDM_VIEW_REUSEWINDOW:
 		bReuseWindow = !bReuseWindow;
 		IniSetBoolEx(INI_SECTION_NAME_FLAGS, L"ReuseWindow", bReuseWindow, 0);
@@ -5792,8 +5804,9 @@ void SaveSettings(BOOL bSaveSettingsNow) {
 	IniSectionSetIntEx(pIniSection, L"FullScreenMode", iFullScreenMode, FullScreenMode_Default);
 
 	SaveIniSection(INI_SECTION_NAME_SETTINGS, pIniSectionBuf);
-
-	SaveWindowPosition(bSaveSettingsNow, pIniSectionBuf);
+	if (!bStickyWindowPosition) {
+		SaveWindowPosition(bSaveSettingsNow, pIniSectionBuf);
+	}
 	// Scintilla Styles
 	Style_Save();
 }
@@ -6559,6 +6572,7 @@ void LoadFlags(void) {
 
 	bSingleFileInstance = IniSectionGetBool(pIniSection, L"SingleFileInstance", 1);
 	bReuseWindow = IniSectionGetBool(pIniSection, L"ReuseWindow", 0);
+	bStickyWindowPosition = IniSectionGetBool(pIniSection, L"StickyWindowPosition", 0);
 
 	if (!flagReuseWindow && !flagNoReuseWindow) {
 		flagNoReuseWindow = !bReuseWindow;

diff --git a/src/Notepad2.rc b/src/Notepad2.rc
@@ -626,6 +626,7 @@ BEGIN
 			MENUITEM "Minimi&ze to Tray",			IDM_VIEW_MINTOTRAY
 			MENUITEM SEPARATOR
 			MENUITEM "&Reuse Window",				IDM_VIEW_REUSEWINDOW
+			MENUITEM "&Sticky Window Position",		IDM_VIEW_STICKY_WINDOW_POSITION
 			MENUITEM "Clear Position &History",		IDM_VIEW_CLEARWINPOS
 		END
 		POPUP "Window Title Displa&y"

diff --git a/src/resource.h b/src/resource.h
@@ -666,7 +666,7 @@
 #define IDM_VIEW_FULLSCREEN_ON_START	40469
 #define IDM_VIEW_FULLSCREEN_HIDE_TITLE	40470
 #define IDM_VIEW_FULLSCREEN_HIDE_MENU	40471
-//40472
+#define IDM_VIEW_STICKY_WINDOW_POSITION	40472
 #define IDM_VIEW_ZOOM_LEVEL				40473
 #define IDM_VIEW_HIGHLIGHTCURRENTLINE_NONE		40474
 #define IDM_VIEW_HIGHLIGHTCURRENTLINE_BACK		40475	// Ctrl+Shift+I

diff --git a/tools/ImageTool.py b/tools/ImageTool.py
@@ -226,6 +226,7 @@ def make_notepad2_toolbar_bitmap():
 		'images/.png',			# IDT_FILE_ADDTOFAV
 		'images/.png',			# IDT_VIEW_TOGGLEFOLDS
 		'images/.png',			# IDT_FILE_LAUNCH
+		'images/pin-angle-16x.png',				# IDT_VIEW_ALWAYSONTOP
 	], 'Toolbar.bmp')
 
 #make_matapath_toolbar_bitmap()