tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression about search progress window visual glitch 

Fix #13185, close #13189
This commit is contained in:
ozone10 2023-02-21 16:25:35 +01:00 committed by Don Ho
parent 0649ca9c57
commit ea008dc29d
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -5335,7 +5335,7 @@ void FindIncrementDlg::addToRebar(ReBar * rebar)
return; return;
_pRebar = rebar; _pRebar = rebar;
RECT client; RECT client{};
getClientRect(client); getClientRect(client);
ZeroMemory(&_rbBand, REBARBAND_SIZE); ZeroMemory(&_rbBand, REBARBAND_SIZE);
@ -5374,7 +5374,7 @@ Progress::Progress(HINSTANCE hInst) : _hwnd(NULL), _hCallerWnd(NULL)
{ {
_hInst = hInst; _hInst = hInst;
WNDCLASSEX wcex = {}; WNDCLASSEX wcex{};
wcex.cbSize = sizeof(wcex); wcex.cbSize = sizeof(wcex);
wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.style = CS_HREDRAW | CS_VREDRAW;
wcex.lpfnWndProc = wndProc; wcex.lpfnWndProc = wndProc;
@ -5385,7 +5385,7 @@ Progress::Progress(HINSTANCE hInst) : _hwnd(NULL), _hCallerWnd(NULL)
::RegisterClassEx(&wcex); ::RegisterClassEx(&wcex);
INITCOMMONCONTROLSEX icex = {}; INITCOMMONCONTROLSEX icex{};
icex.dwSize = sizeof(icex); icex.dwSize = sizeof(icex);
icex.dwICC = ICC_STANDARD_CLASSES | ICC_PROGRESS_CLASS; icex.dwICC = ICC_STANDARD_CLASSES | ICC_PROGRESS_CLASS;
@ -5487,7 +5487,7 @@ int Progress::thread()
return r; return r;
// Window message loop // Window message loop
MSG msg; MSG msg{};
while ((r = ::GetMessage(&msg, NULL, 0, 0)) != 0 && r != -1) while ((r = ::GetMessage(&msg, NULL, 0, 0)) != 0 && r != -1)
{ {
::TranslateMessage(&msg); ::TranslateMessage(&msg);
@ -5510,13 +5510,14 @@ int Progress::createProgressWindow()
if (!_hwnd) if (!_hwnd)
return -1; return -1;
int widthPadding = dpiManager.scaleX(15); const int paddedBorder = 3 * ::GetSystemMetrics(SM_CXPADDEDBORDER);
int widthPadding = dpiManager.scaleX(15) + paddedBorder;
int width = cPBwidth + widthPadding; int width = cPBwidth + widthPadding;
int textHeight = dpiManager.scaleY(20); int textHeight = dpiManager.scaleY(20);
int progressBarPadding = dpiManager.scaleY(10); int progressBarPadding = dpiManager.scaleY(10);
int morePadding = dpiManager.scaleY(45); int morePadding = dpiManager.scaleY(45);
int height = cPBheight + cBTNheight + textHeight + progressBarPadding + morePadding; int height = cPBheight + cBTNheight + textHeight + progressBarPadding + morePadding + paddedBorder;
POINT center{}; POINT center{};
@ -5535,7 +5536,7 @@ int Progress::createProgressWindow()
auto ctrlWidth = width - widthPadding - xStartPos; auto ctrlWidth = width - widthPadding - xStartPos;
_hPText = ::CreateWindowEx(0, TEXT("STATIC"), TEXT(""), _hPText = ::CreateWindowEx(0, TEXT("STATIC"), TEXT(""),
WS_CHILD | WS_VISIBLE | BS_TEXT | SS_PATHELLIPSIS, WS_CHILD | WS_VISIBLE | SS_PATHELLIPSIS,
xStartPos, yTextPos, xStartPos, yTextPos,
ctrlWidth, textHeight, _hwnd, NULL, _hInst, NULL); ctrlWidth, textHeight, _hwnd, NULL, _hInst, NULL);
@ -5595,14 +5596,22 @@ LRESULT APIENTRY Progress::wndProc(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM l
} }
case WM_CTLCOLORDLG: case WM_CTLCOLORDLG:
{
if (NppDarkMode::isEnabled())
{
return NppDarkMode::onCtlColorDarker(reinterpret_cast<HDC>(wparam));
}
break;
}
case WM_CTLCOLORSTATIC: case WM_CTLCOLORSTATIC:
{ {
if (NppDarkMode::isEnabled()) if (NppDarkMode::isEnabled())
{ {
return NppDarkMode::onCtlColorDarker(reinterpret_cast<HDC>(wparam)); return NppDarkMode::onCtlColorDarker(reinterpret_cast<HDC>(wparam));
} }
// transparent background for text, same as main window background
break; return reinterpret_cast<LRESULT>(::GetSysColorBrush(NULL_BRUSH));
} }
case WM_PRINTCLIENT: case WM_PRINTCLIENT:
@ -5621,10 +5630,8 @@ LRESULT APIENTRY Progress::wndProc(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM l
RECT rc = {}; RECT rc = {};
GetClientRect(hwnd, &rc); GetClientRect(hwnd, &rc);
::FillRect(reinterpret_cast<HDC>(wparam), &rc, NppDarkMode::getDarkerBackgroundBrush()); ::FillRect(reinterpret_cast<HDC>(wparam), &rc, NppDarkMode::getDarkerBackgroundBrush());
return TRUE;
} }
return TRUE;
break;
} }
case WM_SETFOCUS: case WM_SETFOCUS: