CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into mui

Browse Source
This commit is contained in:
Pairi Daiza 2022-08-30 13:56:38 +02:00
commit 3fb9b89414
No known key found for this signature in database
GPG Key ID: AC2515EF755AF96F
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config/Config.cpp
View File

@ -1432,6 +1432,7 @@ void LoadSettings()
GET_BOOL_VALUE_FROM_INISECTION(SaveRecentFiles, true);
GET_BOOL_VALUE_FROM_INISECTION(PreserveCaretPos, false);
GET_BOOL_VALUE_FROM_INISECTION(SaveFindReplace, false);
GET_BOOL_VALUE_FROM_INISECTION(DocReadOnlyMode, false);
Defaults.EFR_Data.bFindClose = false;
Settings.EFR_Data.bFindClose = IniSectionGetBool(IniSecSettings, L"CloseFind", Defaults.EFR_Data.bFindClose);
@ -1884,6 +1885,7 @@ static bool _SaveSettings(bool bForceSaveSettings)
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, PreserveCaretPos);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, SaveFindReplace);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, SaveFindReplace);
SAVE_VALUE_IF_NOT_EQ_DEFAULT(Bool, DocReadOnlyMode);
if (Settings.EFR_Data.bFindClose != Defaults.EFR_Data.bFindClose) {
IniSectionSetBool(IniSecSettings, L"CloseFind", Settings.EFR_Data.bFindClose);

2
src/Notepad3.c
View File

@ -5664,6 +5664,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
case IDM_VIEW_READONLY:
SciCall_SetReadOnly(!SciCall_GetReadOnly());
Settings.DocReadOnlyMode = SciCall_GetReadOnly();
UpdateToolbar();
break;
@ -10504,6 +10505,7 @@ bool FileIO(bool fLoad, const HPATHL hfile_pth, EditFileIOStatus* status,
if (fLoad) {
SciCall_SetReadOnly(false);
fSuccess = EditLoadFile(Globals.hwndEdit, hfile_pth, status, fLoadFlags, bSetSavePoint);
SciCall_SetReadOnly(Settings.DocReadOnlyMode);
} else {
int idx;
if (MRU_FindPath(Globals.pFileMRU, hfile_pth, &idx)) {

1
src/TypeDefs.h
View File

@ -527,6 +527,7 @@ typedef struct SETTINGS_T {
int WordWrapIndent;
int WordWrapSymbols;
bool ShowWordWrapSymbols;
bool DocReadOnlyMode;
bool MatchBraces;
bool AutoCloseTags;
int HighlightCurrentLine;