tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-29 08:44:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix autocomplete/calltip colors not applied when changing themes

Browse Source 
Fix #12514, close #12666
This commit is contained in:
ozone10 2022-12-18 09:28:47 +01:00 committed by Don Ho
parent 3012cb192a
commit be98609801
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PowerEditor/src/Notepad_plus.cpp
View File

@ -5934,7 +5934,29 @@ void Notepad_plus::drawTabbarColoursFromStylerArray()
void Notepad_plus::drawAutocompleteColoursFromTheme(COLORREF fgColor, COLORREF bgColor) void Notepad_plus::drawAutocompleteColoursFromTheme(COLORREF fgColor, COLORREF bgColor)
{ {
if (bgColor == 0xFFFFFF) if (bgColor == 0xFFFFFF)
{
// default colors from PlatWin.cxx void ListBoxX::Draw(DRAWITEMSTRUCT *pDrawItem)
COLORREF autocompleteBg = ::GetSysColor(COLOR_WINDOW);
COLORREF selectedBg = ::GetSysColor(COLOR_HIGHLIGHT);
COLORREF autocompleteText = ::GetSysColor(COLOR_WINDOWTEXT);
COLORREF selectedText = ::GetSysColor(COLOR_HIGHLIGHTTEXT);
AutoCompletion::setColour(autocompleteBg, AutoCompletion::AutocompleteColorIndex::autocompleteBg);
AutoCompletion::setColour(selectedBg, AutoCompletion::AutocompleteColorIndex::selectedBg);
AutoCompletion::setColour(autocompleteText, AutoCompletion::AutocompleteColorIndex::autocompleteText);
AutoCompletion::setColour(selectedText, AutoCompletion::AutocompleteColorIndex::selectedText);
// default colors from CallTip.cxx CallTip::CallTip() noexcept
COLORREF colourBG = bgColor;
COLORREF colourUnSel = RGB(0x80, 0x80, 0x80);
COLORREF colourSel = RGB(0, 0, 0x80);
AutoCompletion::setColour(colourBG, AutoCompletion::AutocompleteColorIndex::calltipBg);
AutoCompletion::setColour(colourUnSel, AutoCompletion::AutocompleteColorIndex::calltipText);
AutoCompletion::setColour(colourSel, AutoCompletion::AutocompleteColorIndex::calltipHighlight);
return; return;
}
int rbv = GetRValue(bgColor); int rbv = GetRValue(bgColor);
int gbv = GetGValue(bgColor); int gbv = GetGValue(bgColor);