Skip to content

Store Region in GC.SetClippingRegionOperation #62 #2336

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
Jul 23, 2025
+15 −7
Merged

Store Region in GC.SetClippingRegionOperation #62 #2336

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
16 changes: 9 additions & 7 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4730,19 +4730,21 @@ void apply() {

private void setClipping(long clipRgn) {
checkNonDisposed();
storeAndApplyOperationForExistingHandle(new SetClippingRegionOperation(clipRgn));
setClippingRegion(clipRgn);
}

private class SetClippingRegionOperation extends Operation {
private final long clipRgn;
private final Region clipRgn;

SetClippingRegionOperation(long clipRgn) {
this.clipRgn = clipRgn;
SetClippingRegionOperation(Region clipRgn) {
this.clipRgn = clipRgn != null ? clipRgn.copy() : null;
registerForDisposal(this.clipRgn);
}

@Override
void apply() {
setClippingRegion(clipRgn);
// Reset clipping if clipRgn is null.
setClippingRegion(clipRgn != null ? Region.win32_getHandle(clipRgn, getZoom()) : 0);
}
}

Expand Down Expand Up @@ -4880,7 +4882,7 @@ void apply() {
public void setClipping (Rectangle rect) {
checkNonDisposed();
if (rect == null) {
setClipping(0);
storeAndApplyOperationForExistingHandle(new SetClippingRegionOperation(null));
} else {
storeAndApplyOperationForExistingHandle(new SetClippingOperation(rect));
}
Expand All @@ -4905,7 +4907,7 @@ public void setClipping (Rectangle rect) {
public void setClipping (Region region) {
checkNonDisposed();
if (region != null && region.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
setClipping(region != null ? Region.win32_getHandle(region, getZoom()) : 0);
storeAndApplyOperationForExistingHandle(new SetClippingRegionOperation(region));
}

/**
Expand Down
6 changes: 6 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,12 @@ private RegionHandle getRegionHandle(int zoom) {
return zoomToHandle.get(zoom);
}

Region copy() {
Region region = new Region();
region.operations.addAll(operations);
return region;
}

/**
* <b>IMPORTANT:</b> This method is not part of the public
* API for Image. It is marked public only so that it
Expand Down
Loading