From 4e71b4cf2f113f5f5a8cd488b3b8e433006f5a60 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Sat, 19 Aug 2017 08:51:40 +0200 Subject: [PATCH] + fix: manually edited settings (SciDirectWriteTech, SciFontQuality) should be placed in settings section [Settings2]. --- distrib/Notepad3.ini | Bin 1150 -> 1150 bytes src/Notepad3.c | 13 ++++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/distrib/Notepad3.ini b/distrib/Notepad3.ini index 7349d7bbaf83f6aff29a8379c0a07b9abd943771..3a5f01638a1c502fd1f3a985da4e89f106cfccfc 100644 GIT binary patch delta 21 dcmeyz@sDG}Hpb0dOi_%Jw=srnPGOc}1OQ-%2VnpJ delta 21 dcmeyz@sDG}Hpa;U%pse%F-9?NPGOc}1OQ><2WS8Q diff --git a/src/Notepad3.c b/src/Notepad3.c index 6833e0bc4..bcdadce3c 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -5883,12 +5883,6 @@ void LoadSettings() xFindReplaceDlg = IniSectionGetInt(pIniSection,L"FindReplaceDlgPosX",0); yFindReplaceDlg = IniSectionGetInt(pIniSection,L"FindReplaceDlgPosY",0); - iSciDirectWriteTech = IniSectionGetInt(pIniSection,L"SciDirectWriteTech",-1); - iSciDirectWriteTech = max(min(iSciDirectWriteTech,3),-1); - - iSciFontQuality = IniSectionGetInt(pIniSection,L"SciFontQuality",-1); - iSciFontQuality = max(min(iSciFontQuality,3),-1); - LoadIniSection(L"Settings2",pIniSection,cchIniSection); @@ -5909,6 +5903,12 @@ void LoadSettings() dwFileCheckInverval = IniSectionGetInt(pIniSection,L"FileCheckInverval",2000); dwAutoReloadTimeout = IniSectionGetInt(pIniSection,L"AutoReloadTimeout",2000); + iSciDirectWriteTech = IniSectionGetInt(pIniSection,L"SciDirectWriteTech",-1); + iSciDirectWriteTech = max(min(iSciDirectWriteTech,3),-1); + + iSciFontQuality = IniSectionGetInt(pIniSection,L"SciFontQuality",-1); + iSciFontQuality = max(min(iSciFontQuality,3),-1); + WCHAR buffer[MIDSZ_BUFFER]; const WCHAR defextwsc[] = L".,;:|/-+$%&<>(){}[]=?#'*"; IniSectionGetString(pIniSection, L"ExtendedWhiteSpaceChars", defextwsc, buffer, COUNTOF(buffer)); @@ -6103,7 +6103,6 @@ void SaveSettings(BOOL bSaveSettingsNow) { IniSectionSetInt(pIniSection, L"FavoritesDlgSizeY", cyFavoritesDlg); IniSectionSetInt(pIniSection, L"FindReplaceDlgPosX", xFindReplaceDlg); IniSectionSetInt(pIniSection, L"FindReplaceDlgPosY", yFindReplaceDlg); - IniSectionSetInt(pIniSection, L"SciFontQuality", iSciFontQuality); SaveIniSection(L"Settings", pIniSection); LocalFree(pIniSection);