From 947797a501686383f9b65ea11087b769f94d4a02 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Fri, 12 Jan 2018 11:31:02 +0100 Subject: [PATCH] + fix: bug on switching between 1st and 2nd standard lexers --- src/Styles.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Styles.c b/src/Styles.c index 88f43d160..3dfb98779 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -4189,6 +4189,9 @@ void Style_ToggleUse2ndDefault(HWND hwnd) { BOOL use2ndDefStyle = Style_GetUse2ndDefault(); Style_SetUse2ndDefault(use2ndDefStyle ? FALSE : TRUE); // swap + if (IsLexerStandard(g_pLexCurrent)) { + g_pLexCurrent = Style_GetUse2ndDefault() ? &lexStandard2nd : &lexStandard; + } Style_SetLexer(hwnd,g_pLexCurrent); } @@ -6004,13 +6007,15 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR lvi.mask = LVIF_PARAM; for (i = 0; i < lvItems; i++) { lvi.iItem = i; - ListView_GetItem(hwndLV,&lvi);; - if (StringCchCompareX(((PEDITLEXER)lvi.lParam)->pszName,g_pLexCurrent->pszName) == 0) { + ListView_GetItem(hwndLV,&lvi); + if (StringCchCompareX(((PEDITLEXER)lvi.lParam)->pszName, g_pLexCurrent->pszName) == 0) + { ListView_SetItemState(hwndLV,i,LVIS_FOCUSED|LVIS_SELECTED,LVIS_FOCUSED|LVIS_SELECTED); ListView_EnsureVisible(hwndLV,i,FALSE); if (g_iDefaultLexer == i) { CheckDlgButton(hwnd,IDC_DEFAULTSCHEME,BST_CHECKED); } + break; } }