Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme fixes and enhancements #2231

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions SystemInformer/actions.c
Original file line number Diff line number Diff line change
Expand Up @@ -4952,11 +4952,7 @@ BOOLEAN PhUiCloseConnections(

if (!SetTcpEntry_I)
{
PhShowError(
WindowHandle,
L"%s",
L"This feature is not supported by your operating system."
);
PhShowError2(WindowHandle, L"This feature is not supported by your operating system.", L"%s", L"");
return FALSE;
}

Expand Down Expand Up @@ -5640,7 +5636,7 @@ BOOLEAN PhUiUnloadModule(

if (status == STATUS_DLL_NOT_FOUND)
{
PhShowError(WindowHandle, L"%s", L"Unable to find the module to unload.");
PhShowError2(WindowHandle, L"Unable to find the module to unload.", L"%s", L"");
return FALSE;
}

Expand Down
21 changes: 20 additions & 1 deletion SystemInformer/chdlg.c
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,10 @@ INT_PTR CALLBACK PhChooseNewPageDlgProc(
}

PhSetDialogFocus(WindowHandle, context->ComboBoxHandle);

if (PhEnableThemeSupport)
DestroyWindow(GetDlgItem(WindowHandle, IDC_SIZE_));
DartVanya marked this conversation as resolved.
Show resolved Hide resolved
PhInitializeWindowTheme(WindowHandle, PhEnableThemeSupport);
}
break;
case WM_DESTROY:
Expand Down Expand Up @@ -560,7 +564,22 @@ INT_PTR CALLBACK PhChooseNewPageDlgProc(

clientRect.top = clientRect.bottom;
clientRect.bottom = clientRect.top + PhGetDpi(50, dpi);
FillRect(hdc, &clientRect, PhEnableThemeSupport ? PhThemeWindowBackgroundBrush : GetSysColorBrush(COLOR_3DFACE));

if (PhEnableThemeSupport)
{
SetDCBrushColor(hdc, RGB(50, 50, 50));
FillRect(hdc, &clientRect, PhGetStockBrush(DC_BRUSH));
clientRect.bottom = clientRect.top + 1;
SetDCBrushColor(hdc, PhThemeWindowForegroundColor);
FillRect(hdc, &clientRect, PhGetStockBrush(DC_BRUSH));
PhOffsetRect(&clientRect, 0, 1);
SetDCBrushColor(hdc, PhThemeWindowBackground2Color);
FillRect(hdc, &clientRect, PhGetStockBrush(DC_BRUSH));
}
else
{
FillRect(hdc, &clientRect, GetSysColorBrush(COLOR_3DFACE));
}

SetWindowLongPtr(WindowHandle, DWLP_MSGRESULT, TRUE);
}
Expand Down
Loading
Loading