From 063eff4975cfec50ef863d11893509ddd2cd03f9 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 10 Mar 2020 11:45:41 +0100 Subject: [PATCH] + fix: remember caret position only possible with file history --- src/Dialogs.c | 12 ++++++++---- src/Notepad3.c | 8 +------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/Dialogs.c b/src/Dialogs.c index cfa36678e..48f69bd15 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -1687,10 +1687,7 @@ static INT_PTR CALLBACK FileMRUDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM CheckDlgButton(hwnd, IDC_PRESERVECARET, SetBtn(Settings.PreserveCaretPos)); CheckDlgButton(hwnd, IDC_REMEMBERSEARCHPATTERN, SetBtn(Settings.SaveFindReplace)); - //~if (!Settings.SaveRecentFiles) { - //~ DialogEnableWindow(hwnd,IDC_PRESERVECARET, false); - //~ DialogEnableWindow(hwnd,IDC_REMEMBERSEARCHPATTERN, false); - //~} + DialogEnableControl(hwnd,IDC_PRESERVECARET, Settings.SaveRecentFiles); CenterDlgInParent(hwnd, NULL); } @@ -1913,6 +1910,13 @@ static INT_PTR CALLBACK FileMRUDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM case IDC_FILEMRU: break; + case IDC_SAVEMRU: + { + bool const bSaveMRU = IsButtonChecked(hwnd, IDC_SAVEMRU); + DialogEnableControl(hwnd, IDC_PRESERVECARET, bSaveMRU); + } + break; + case IDOK: case IDC_REMOVE: { diff --git a/src/Notepad3.c b/src/Notepad3.c index 2bf3d8ec6..c12e4320b 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -3409,6 +3409,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) CheckCmd(hmenu, IDM_VIEW_NOSAVERECENT, Settings.SaveRecentFiles); CheckCmd(hmenu, IDM_VIEW_NOPRESERVECARET, Settings.PreserveCaretPos); + EnableCmd(hmenu, IDM_VIEW_NOPRESERVECARET, Settings.SaveRecentFiles); CheckCmd(hmenu, IDM_VIEW_NOSAVEFINDREPL, Settings.SaveFindReplace); CheckCmd(hmenu, IDM_VIEW_SAVEBEFORERUNNINGTOOLS, Settings.SaveBeforeRunningTools); @@ -3432,13 +3433,6 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam) i = IDM_VIEW_NOESCFUNC; CheckMenuRadioItem(hmenu, IDM_VIEW_NOESCFUNC, IDM_VIEW_ESCEXIT, i, MF_BYCOMMAND); - 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_NOPRESERVECARET, i); - EnableCmd(hmenu, IDM_VIEW_NOSAVEFINDREPL, i); - EnableCmd(hmenu, CMD_WEBACTION1, !se && !mrs && bPosInSel); EnableCmd(hmenu, CMD_WEBACTION2, !se && !mrs && bPosInSel); bool const bIsHLink = (SciCall_IndicatorValueAt(INDIC_NP3_HYPERLINK, iCurPos) > 0);