Skip to content

Revert "Replace usages of new Image(device, width, height)..." #2162 #2163

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

Merged
merged 1 commit into from
May 20, 2025
Merged

Revert "Replace usages of new Image(device, width, height)..." #2162 #2163

Show file tree
Hide file tree
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
27 changes: 9 additions & 18 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,6 +1554,8 @@ LRESULT WM_PAINT (long wParam, long lParam) {
data.ps = ps;
data.hwnd = handle;
GC gc = GC.win32_new (this, data);

/* Get the system region for the paint HDC */
long sysRgn = 0;
if ((style & (SWT.DOUBLE_BUFFERED | SWT.TRANSPARENT)) != 0 || (style & SWT.NO_MERGE_PAINTS) != 0) {
sysRgn = OS.CreateRectRgn (0, 0, 0, 0);
Expand All @@ -1579,25 +1581,14 @@ LRESULT WM_PAINT (long wParam, long lParam) {
GC paintGC = null;
Image image = null;
if ((style & (SWT.DOUBLE_BUFFERED | SWT.TRANSPARENT)) != 0) {
image = new Image (display, width, height);
paintGC = gc;
int originalStyle = gc.getStyle();
ImageGcDrawer drawer = new ImageGcDrawer() {
@Override
public void drawOn(GC gc, int iWidth, int iHeight) {
GCData gcData = gc.getGCData ();
gcData.uiState = data.uiState;
gc.setForeground (getForeground ());
gc.setBackground (getBackground ());
gc.setFont (getFont ());

}

@Override
public int getGcStyle() {
return originalStyle & SWT.RIGHT_TO_LEFT;
}
};
image = new Image (display, drawer, width, height);
gc = new GC (image, paintGC.getStyle() & SWT.RIGHT_TO_LEFT);
GCData gcData = gc.getGCData ();
gcData.uiState = data.uiState;
gc.setForeground (getForeground ());
gc.setBackground (getBackground ());
gc.setFont (getFont ());
if ((style & SWT.TRANSPARENT) != 0) {
OS.BitBlt (gc.handle, 0, 0, width, height, paintGC.handle, ps.left, ps.top, OS.SRCCOPY);
}
Expand Down
12 changes: 12 additions & 0 deletions ...tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Composite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,18 @@ public boolean setFocus() {
button2.dispose();
}

/*
* See https://github.com/eclipse-platform/eclipse.platform.swt/issues/2162
*/
@Test
public void test_bug2162_transparentStyle() {
Composite c = new Composite(shell, SWT.TRANSPARENT);
c.addPaintListener(e -> {});

shell.setLayout(new FillLayout());
shell.open();
}

protected Composite getElementExpectedToHaveFocusAfterSetFocusOnParent(Composite visibleChild) {
return visibleChild;
}
Expand Down
Loading