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

Merge pull request #65 from RaiKoHoff/Bugfix_450

Browse Source 
wrong settings section for SciDirectWrite and SciFontQuality
This commit is contained in:
Derick Payne 2017-08-21 16:01:56 +02:00 committed by GitHub
commit c442af31ab
2 changed files with 13 additions and 10 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.

23
src/Notepad3.c
View File

@ -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,12 +5903,22 @@ void LoadSettings()
dwFileCheckInverval = IniSectionGetInt(pIniSection,L"FileCheckInverval",2000);
dwAutoReloadTimeout = IniSectionGetInt(pIniSection,L"AutoReloadTimeout",2000);
WCHAR buffer[MIDSZ_BUFFER];
const WCHAR defextwsc[] = L".,;:|/-+$%&<>(){}[]=?#'*";
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] = { L'\0' };
const WCHAR defextwsc[] = L"!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~"; // underscore counted as part of word
IniSectionGetString(pIniSection, L"ExtendedWhiteSpaceChars", defextwsc, buffer, COUNTOF(buffer));
if (!lstrlen(buffer)) lstrcpyn(buffer, defextwsc, COUNTOF(buffer));
WCHAR2MBCS(CP_ACP,buffer,chExtendedWhiteSpaceChars,COUNTOF(chExtendedWhiteSpaceChars));
// clear non-7-bit-ASCII chars
for (size_t i = 0; i < strlen(chExtendedWhiteSpaceChars); i++) {
if (chExtendedWhiteSpaceChars[i] & ~0x7F)
chExtendedWhiteSpaceChars[i] = ' '; // space
}
LoadIniSection(L"Toolbar Images",pIniSection,cchIniSection);
@ -6103,7 +6107,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);