mirror of
https://github.com/notepad-plus-plus/notepad-plus-plus.git
synced 2025-07-21 21:04:54 +02:00
Make line above panel toolbar dark in dark mode
Fix #10043, close #10042
This commit is contained in:
parent
ffbf3af029
commit
a6bbdeb92e
@ -7524,6 +7524,27 @@ void Notepad_plus::refreshDarkMode()
|
|||||||
NppDarkMode::setDarkTitleBar(docCont->getCaptionWnd());
|
NppDarkMode::setDarkTitleBar(docCont->getCaptionWnd());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_pProjectPanel_1)
|
||||||
|
{
|
||||||
|
::SendMessage(_pProjectPanel_1->getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
||||||
|
}
|
||||||
|
if (_pProjectPanel_2)
|
||||||
|
{
|
||||||
|
::SendMessage(_pProjectPanel_2->getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
||||||
|
}
|
||||||
|
if (_pProjectPanel_3)
|
||||||
|
{
|
||||||
|
::SendMessage(_pProjectPanel_3->getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
||||||
|
}
|
||||||
|
if (_pFuncList)
|
||||||
|
{
|
||||||
|
::SendMessage(_pFuncList->getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
||||||
|
}
|
||||||
|
if (_pFileBrowser)
|
||||||
|
{
|
||||||
|
::SendMessage(_pFileBrowser->getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
SendMessage(_findReplaceDlg.getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
SendMessage(_findReplaceDlg.getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
||||||
SendMessage(_incrementFindDlg.getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
SendMessage(_incrementFindDlg.getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0);
|
||||||
RedrawWindow(_pPublicInterface->getHSelf(), nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN);
|
RedrawWindow(_pPublicInterface->getHSelf(), nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN);
|
||||||
|
@ -1091,4 +1091,23 @@ namespace NppDarkMode
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setDarkLineAbovePanelToolbar(HWND hwnd)
|
||||||
|
{
|
||||||
|
COLORSCHEME scheme;
|
||||||
|
scheme.dwSize = sizeof(COLORSCHEME);
|
||||||
|
|
||||||
|
if (NppDarkMode::isEnabled())
|
||||||
|
{
|
||||||
|
scheme.clrBtnHighlight = NppDarkMode::getBackgroundColor();
|
||||||
|
scheme.clrBtnShadow = NppDarkMode::getBackgroundColor();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
scheme.clrBtnHighlight = CLR_DEFAULT;
|
||||||
|
scheme.clrBtnShadow = CLR_DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
|
::SendMessage(hwnd, TB_SETCOLORSCHEME, 0, reinterpret_cast<LPARAM>(&scheme));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -84,4 +84,5 @@ namespace NppDarkMode
|
|||||||
|
|
||||||
void setDarkTitleBar(HWND hwnd);
|
void setDarkTitleBar(HWND hwnd);
|
||||||
void setDarkTooltips(HWND hwnd, ToolTipsType type);
|
void setDarkTooltips(HWND hwnd, ToolTipsType type);
|
||||||
|
void setDarkLineAbovePanelToolbar(HWND hwnd);
|
||||||
}
|
}
|
||||||
|
@ -107,6 +107,7 @@ INT_PTR CALLBACK FileBrowser::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
|
|||||||
_hToolbarMenu = CreateWindowEx(WS_EX_LAYOUTRTL, TOOLBARCLASSNAME, NULL, style, 0, 0, 0, 0, _hSelf, nullptr, _hInst, NULL);
|
_hToolbarMenu = CreateWindowEx(WS_EX_LAYOUTRTL, TOOLBARCLASSNAME, NULL, style, 0, 0, 0, 0, _hSelf, nullptr, _hInst, NULL);
|
||||||
|
|
||||||
NppDarkMode::setDarkTooltips(_hToolbarMenu, NppDarkMode::ToolTipsType::toolbar);
|
NppDarkMode::setDarkTooltips(_hToolbarMenu, NppDarkMode::ToolTipsType::toolbar);
|
||||||
|
NppDarkMode::setDarkLineAbovePanelToolbar(_hToolbarMenu);
|
||||||
|
|
||||||
TBBUTTON tbButtons[3];
|
TBBUTTON tbButtons[3];
|
||||||
// Add the bmap image into toolbar's imagelist
|
// Add the bmap image into toolbar's imagelist
|
||||||
@ -169,6 +170,12 @@ INT_PTR CALLBACK FileBrowser::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case NPPM_INTERNAL_REFRESHDARKMODE:
|
||||||
|
{
|
||||||
|
NppDarkMode::setDarkLineAbovePanelToolbar(_hToolbarMenu);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case WM_MOUSEMOVE:
|
case WM_MOUSEMOVE:
|
||||||
if (_treeView.isDragging())
|
if (_treeView.isDragging())
|
||||||
_treeView.dragItem(_hSelf, LOWORD(lParam), HIWORD(lParam));
|
_treeView.dragItem(_hSelf, LOWORD(lParam), HIWORD(lParam));
|
||||||
|
@ -772,6 +772,7 @@ INT_PTR CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPA
|
|||||||
0,0,0,0,_hSelf,nullptr, _hInst, NULL);
|
0,0,0,0,_hSelf,nullptr, _hInst, NULL);
|
||||||
|
|
||||||
NppDarkMode::setDarkTooltips(_hToolbarMenu, NppDarkMode::ToolTipsType::toolbar);
|
NppDarkMode::setDarkTooltips(_hToolbarMenu, NppDarkMode::ToolTipsType::toolbar);
|
||||||
|
NppDarkMode::setDarkLineAbovePanelToolbar(_hToolbarMenu);
|
||||||
|
|
||||||
oldFunclstToolbarProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(_hToolbarMenu, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(funclstToolbarProc)));
|
oldFunclstToolbarProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(_hToolbarMenu, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(funclstToolbarProc)));
|
||||||
TBBUTTON tbButtons[3];
|
TBBUTTON tbButtons[3];
|
||||||
@ -834,6 +835,12 @@ INT_PTR CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPA
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case NPPM_INTERNAL_REFRESHDARKMODE:
|
||||||
|
{
|
||||||
|
NppDarkMode::setDarkLineAbovePanelToolbar(_hToolbarMenu);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case WM_DESTROY:
|
case WM_DESTROY:
|
||||||
_treeView.destroy();
|
_treeView.destroy();
|
||||||
_treeViewSearchResult.destroy();
|
_treeViewSearchResult.destroy();
|
||||||
|
@ -54,6 +54,9 @@ INT_PTR CALLBACK ProjectPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM l
|
|||||||
int style = WS_CHILD | WS_VISIBLE | CCS_ADJUSTABLE | TBSTYLE_AUTOSIZE | TBSTYLE_FLAT | TBSTYLE_LIST;
|
int style = WS_CHILD | WS_VISIBLE | CCS_ADJUSTABLE | TBSTYLE_AUTOSIZE | TBSTYLE_FLAT | TBSTYLE_LIST;
|
||||||
_hToolbarMenu = CreateWindowEx(0,TOOLBARCLASSNAME,NULL, style,
|
_hToolbarMenu = CreateWindowEx(0,TOOLBARCLASSNAME,NULL, style,
|
||||||
0,0,0,0,_hSelf, nullptr, _hInst, nullptr);
|
0,0,0,0,_hSelf, nullptr, _hInst, nullptr);
|
||||||
|
|
||||||
|
NppDarkMode::setDarkLineAbovePanelToolbar(_hToolbarMenu);
|
||||||
|
|
||||||
TBBUTTON tbButtons[2];
|
TBBUTTON tbButtons[2];
|
||||||
|
|
||||||
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
|
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
|
||||||
@ -94,6 +97,11 @@ INT_PTR CALLBACK ProjectPanel::run_dlgProc(UINT message, WPARAM wParam, LPARAM l
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case NPPM_INTERNAL_REFRESHDARKMODE:
|
||||||
|
{
|
||||||
|
NppDarkMode::setDarkLineAbovePanelToolbar(_hToolbarMenu);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case WM_MOUSEMOVE:
|
case WM_MOUSEMOVE:
|
||||||
if (_treeView.isDragging())
|
if (_treeView.isDragging())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user