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

+ fix: flashing of Search text-box of find/replace dialog in case of Win7 Classic theme

Browse Source 
+ add [Settings2] section default values (and comment out if not changed) of initially distributed Notepad3.ini
This commit is contained in:
Rainer Kottenhoff 2017-12-04 10:00:14 +01:00
parent b7ab5aebb9
commit 71ad2dc473
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
distrib/Notepad3.ini
View File

Binary file not shown.

4
src/Edit.c
View File

@ -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;

11
src/Notepad3.c
View File

@ -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);