Skip to content

Fix the selected background in Toolbar on Windows #3202

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.

Sign up for GitHub

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

Open
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −3
Open

Fix the selected background in Toolbar on Windows #3202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,17 +1688,30 @@ LRESULT wmNotifyChild (NMHDR hdr, long wParam, long lParam) {
}
case OS.CDDS_PREPAINT: {
long result = OS.CDRF_DODEFAULT;
if (background != -1 || (foreground != -1 && OS.IsWindowEnabled (handle)) || (state & CUSTOM_DRAW_ITEM) != 0) {
if (background != -1 || (foreground != -1 && OS.IsWindowEnabled (handle)) || (state & CUSTOM_DRAW_ITEM) != 0 || display.useDarkModeExplorerTheme) {
result = OS.CDRF_NOTIFYITEMDRAW;
}
return new LRESULT (result);
}
case OS.CDDS_ITEMPREPAINT: {
long result = OS.TBCDRF_USECDCOLORS;
nmcd.clrBtnFace = getBackgroundPixel (child);
int bgPixel = getBackgroundPixel (child);
nmcd.clrBtnFace = bgPixel;
nmcd.clrBtnHighlight = getDifferentColor (bgPixel);
nmcd.clrText = getForegroundPixel (child);
OS.MoveMemory (lParam, nmcd, NMTBCUSTOMDRAW.sizeof);
if (child != null && child.background != -1) {
if (display.useDarkModeExplorerTheme && (nmcd.uItemState & (OS.CDIS_CHECKED | OS.CDIS_HOT)) != 0) {
int pixel;
if ((nmcd.uItemState & OS.CDIS_CHECKED) != 0) {
pixel = getDifferentColor (bgPixel);
} else {
pixel = getSlightlyDifferentColor (bgPixel);
}
RECT rect = new RECT (nmcd.left, nmcd.top, nmcd.right, nmcd.bottom);
OS.SetDCBrushColor (nmcd.hdc, pixel);
OS.FillRect (nmcd.hdc, rect, OS.GetStockObject (OS.DC_BRUSH));
result |= OS.TBCDRF_NOBACKGROUND;
} else if (child != null && child.background != -1) {
RECT rect = new RECT (nmcd.left, nmcd.top, nmcd.right, nmcd.bottom);
OS.SetDCBrushColor (nmcd.hdc, child.background);
OS.FillRect (nmcd.hdc, rect, OS.GetStockObject (OS.DC_BRUSH));
Expand Down
Loading