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: issue regarding selection of default and 2nd default styling

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-05-09 08:54:55 +02:00
parent 6b469e2044
commit 3cff6841c8
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Notepad3.c
View File

@ -7950,7 +7950,7 @@ static void __fastcall _UpdateStatusbarDelayed(bool bForceRedraw)
// ------------------------------------------------------
static bool s_bUse2ndDefault = -1;
bool const bUse2ndDefault = Style_GetUse2ndDefault();
bool bUse2ndDefault = Style_GetUse2ndDefault();
if (s_bUse2ndDefault != bUse2ndDefault) {
if (bUse2ndDefault)
{

27
src/Styles.c
View File

@ -3135,7 +3135,7 @@ void Style_Load()
LoadIniSection(L"Styles",pIniSection,cchIniSection);
// 2nd default
Style_SetUse2ndDefault(IniSectionGetBool(pIniSection, L"Use2ndDefaultStyle", 0));
Style_SetUse2ndDefault(IniSectionGetBool(pIniSection, L"Use2ndDefaultStyle", false));
// default scheme
g_iDefaultLexer = IniSectionGetInt(pIniSection,L"DefaultScheme",0);
@ -3348,13 +3348,14 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
if (!pLexNew) {
pLexNew = GetDefaultLexer();
}
if (IsLexerStandard(pLexNew)) {
pLexNew = Style_GetUse2ndDefault() ? &lexStandard2nd : &lexStandard;
}
const WCHAR* const wchNewLexerStyleStrg = pLexNew->Styles[STY_DEFAULT].szValue;
// first set standard lexer's default values
g_pLexCurrent = GetCurrentStdLexer();
if (IsLexerStandard(pLexNew))
g_pLexCurrent = pLexNew;
else
g_pLexCurrent = GetCurrentStdLexer();
const WCHAR* const wchStandardStyleStrg = g_pLexCurrent->Styles[STY_DEFAULT].szValue;
// Lexer
@ -4463,7 +4464,7 @@ void Style_SetLexerFromID(HWND hwnd,int id)
//
void Style_ToggleUse2ndDefault(HWND hwnd)
{
bool use2ndDefStyle = Style_GetUse2ndDefault();
bool const use2ndDefStyle = Style_GetUse2ndDefault();
Style_SetUse2ndDefault(use2ndDefStyle ? false : true); // swap
Style_SetLexer(hwnd,g_pLexCurrent);
}
@ -4477,8 +4478,8 @@ void Style_SetDefaultFont(HWND hwnd, bool bGlobalDefault)
{
WCHAR newStyle[BUFSIZE_STYLE_VALUE] = { L'\0' };
const PEDITLEXER pLexer = bGlobalDefault ? GetCurrentStdLexer() : g_pLexCurrent;
const PEDITSTYLE pLexerDefStyle = &(pLexer->Styles[STY_DEFAULT]);
PEDITLEXER const pLexer = bGlobalDefault ? GetCurrentStdLexer() : g_pLexCurrent;
PEDITSTYLE const pLexerDefStyle = &(pLexer->Styles[STY_DEFAULT]);
StringCchCopyW(newStyle, COUNTOF(newStyle), pLexer->Styles[STY_DEFAULT].szValue);
@ -5661,13 +5662,8 @@ int Style_GetCurrentLexerRID()
//
void Style_GetCurrentLexerName(LPWSTR lpszName, int cchName)
{
if (IsLexerStandard(g_pLexCurrent)) {
StringCchPrintfW(lpszName, cchName, L" %s", GetCurrentStdLexer()->pszName);
}
else {
if (!GetString(g_pLexCurrent->resID, lpszName, cchName)) {
StringCchCopyW(lpszName, cchName, g_pLexCurrent->pszName);
}
if (!GetString(g_pLexCurrent->resID, lpszName, cchName)) {
StringCchCopyW(lpszName, cchName, g_pLexCurrent->pszName);
}
}
@ -6644,7 +6640,6 @@ void Style_SelectLexerDlg(HWND hwnd)
MAKEINTRESOURCE(IDD_STYLESELECT),
GetParent(hwnd), Style_SelectLexerDlgProc, 0))
Style_SetUse2ndDefault(g_pLexCurrent == &lexStandard2nd);
Style_SetLexer(hwnd, g_pLexCurrent);
}

BIN
src/Version.h
View File

Binary file not shown.