From 71ad2dc47379a67b94b379bf6463041c39b3218e Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Mon, 4 Dec 2017 10:00:14 +0100
Subject: [PATCH] + fix: flashing of Search text-box of find/replace dialog in
 case of Win7 Classic theme + add [Settings2] section default values (and
 comment out if not changed) of initially distributed Notepad3.ini

---
 distrib/Notepad3.ini | Bin 2144 -> 2424 bytes
 src/Edit.c           |   4 ++--
 src/Notepad3.c       |  11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/distrib/Notepad3.ini b/distrib/Notepad3.ini
index 051fb93b5e01ae021fcd5d42a8f9ada3464605fe..66b8a508b363ddd74c1acdde39a3fa38f2860181 100644
GIT binary patch
delta 502
zcmaDL@Iz?B3?@eF$<vusd5sthz>t@Li@|#GekOUK_+2JNAo-U`9Y`uOD?64jR4|k<
zfK@QKFr+f%F;p^yF=R3n0Yyt05*czBf*A^cbTUxR5lDjQVj#2ynhY`5lUY$V7pNl-
zh(Rh#7%~|2fT}8h7@{JV8Qm>YnU#U|Z)a9zH-xIW&uplV;$8+{p#3>O(=r*{fH((i
ze-T4ElFf!J;_NV2c(X{u*_kYgaCR??B%HmHMILV7X%=Zta|TnW?JrqC;la-e3L#xq
zb-0djR(W<~sG3Svbw-29^I4|@)tItr*F$Y)2m!h-7wEcRpj#7xtOB45V}MWv7@nZe
zNM*2Mh-Qd`ip4T$Ls<$8H4F+UsuUPh86p|<fn+Y2OaaQPGI#*>s{%s<L<WO(Kti>e
N&6v?(^IEpei~#U;Rtf+B

delta 314
zcmew%^gv+445rDmm{gc~8Mr2&W|E)$hDl*EAG6wIGiD{Q*i2?cFnyg_6-;xoC{Na7
zfvAsUF^mN2WAJ4tWyoPDVaQ}~1L7QpR0c<eB8GGZTLzG<A45KaGlM&WClHqc<%)q2
zA>+o7$dCdQ^#JNj0kiTTvXg(ZKx|fIl?2=D$SSW0GS8o(0H`M!sJ?`ulEDY4w+x7L
zpt`zQ)n$W#{8FGTsSM#jRe3;D^BKy4@&+LHOuo#j4mOXGO&(0Ev#C!GV4F7i1)G*M
i$ovqXo?M{bV4(SlKvn_N<caLYlNC6mHa}pW!3Y4T@jOKU

diff --git a/src/Edit.c b/src/Edit.c
index acba0d751..23b3e91c8 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -4797,6 +4797,7 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
               }
             }
             iSaveMarkOcc = -1;
+            InvalidateRect(GetDlgItem(hwnd, IDC_FINDTEXT), NULL, TRUE);
           }
           bFlagsChanged = TRUE;
           SetTimer(hwnd, IDT_TIMER_MRKALL, 100, NULL);
@@ -4819,11 +4820,10 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
               // we have to set Sci's regex instance to first find (have substitution in place)
               EditFindHasMatch(hwndEdit, lpefr, FALSE, TRUE);
               bFlagsChanged = FALSE;
+              InvalidateRect(GetDlgItem(hwnd, IDC_FINDTEXT), NULL, TRUE);
               EndWaitCursor();
             }
           }
-          InvalidateRect(GetDlgItem(hwnd, IDC_FINDTEXT), NULL, TRUE);
-          UpdateWindow(GetDlgItem(hwnd, IDC_FINDTEXT));
         }
         break;
 
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 5ca458de3..9a43d88c7 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -2559,7 +2559,6 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
             PathCchAppend(tchExeFile,COUNTOF(tchExeFile),L"minipath.exe");
           }
         }
-
         else {
           ExtractFirstArgument(tchTemp,tchExeFile,tchParam,MAX_PATH+4);
           if (PathIsRelative(tchExeFile)) {
@@ -5931,11 +5930,11 @@ void LoadSettings()
   dwFileCheckInverval = IniSectionGetInt(pIniSection,L"FileCheckInverval",2000);
   dwAutoReloadTimeout = IniSectionGetInt(pIniSection,L"AutoReloadTimeout",2000);
 
-  iSciDirectWriteTech = IniSectionGetInt(pIniSection,L"SciDirectWriteTech", SC_TECHNOLOGY_DEFAULT);
+  iSciDirectWriteTech = IniSectionGetInt(pIniSection,L"SciDirectWriteTech", DirectWriteTechnology[0]);
   iSciDirectWriteTech = max(min(iSciDirectWriteTech,3),-1);
 
-  iSciFontQuality = IniSectionGetInt(pIniSection,L"SciFontQuality", SC_EFF_QUALITY_DEFAULT);
-  iSciFontQuality = max(min(iSciFontQuality, SC_EFF_QUALITY_LCD_OPTIMIZED), SC_EFF_QUALITY_DEFAULT);
+  iSciFontQuality = IniSectionGetInt(pIniSection,L"SciFontQuality", FontQuality[3]);
+  iSciFontQuality = max(min(iSciFontQuality, 3), 0);
 
   iMarkOccurrencesCount = -1;
   iMarkOccurrencesMaxCount = IniSectionGetInt(pIniSection,L"MarkOccurrencesMaxCount",2000);
@@ -5987,12 +5986,12 @@ void LoadSettings()
 
   // ---  override by resolution specific settings  ---
 
-  WCHAR tchSciDirectWriteTech[32];
+  WCHAR tchSciDirectWriteTech[64];
   StringCchPrintf(tchSciDirectWriteTech,COUNTOF(tchSciDirectWriteTech),L"%ix%i SciDirectWriteTech",ResX,ResY);
   iSciDirectWriteTech = IniSectionGetInt(pIniSection,tchSciDirectWriteTech,iSciDirectWriteTech);
   iSciDirectWriteTech = max(min(iSciDirectWriteTech,3),-1);
 
-  WCHAR tchSciFontQuality[32];
+  WCHAR tchSciFontQuality[64];
   StringCchPrintf(tchSciFontQuality,COUNTOF(tchSciFontQuality),L"%ix%i SciFontQuality",ResX,ResY);
   iSciFontQuality = IniSectionGetInt(pIniSection,tchSciFontQuality,iSciFontQuality);
   iSciFontQuality = max(min(iSciFontQuality, SC_EFF_QUALITY_LCD_OPTIMIZED), SC_TECHNOLOGY_DEFAULT);