Skip to content

[Win32] Remove superceded GC operations from history #2689

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
Oct 30, 2025
Merged

[Win32] Remove superceded GC operations from history #2689

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
42 changes: 33 additions & 9 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 @@ -4799,7 +4799,7 @@ public void setBackground (Color color) {
storeAndApplyOperationForExistingHandle(new SetBackgroundOperation(color));
}

private class SetBackgroundOperation extends Operation {
private class SetBackgroundOperation extends ReplaceableOperation {
private final Color color;

SetBackgroundOperation(Color color) {
Expand Down Expand Up @@ -5113,7 +5113,7 @@ public void setFont (Font font) {
storeAndApplyOperationForExistingHandle(new SetFontOperation(font));
}

private class SetFontOperation extends Operation {
private class SetFontOperation extends ReplaceableOperation {
private final Font font;

SetFontOperation(Font font) {
Expand Down Expand Up @@ -5148,7 +5148,7 @@ public void setForeground (Color color) {
storeAndApplyOperationForExistingHandle(new SetForegroundOperation(color));
}

private class SetForegroundOperation extends Operation {
private class SetForegroundOperation extends ReplaceableOperation {
private final Color color;

SetForegroundOperation(Color color) {
Expand Down Expand Up @@ -5302,7 +5302,7 @@ public void setLineAttributes (LineAttributes attributes) {
storeAndApplyOperationForExistingHandle(new SetLineAttributesOperation(attributes));
}

private class SetLineAttributesOperation extends Operation {
private class SetLineAttributesOperation extends ReplaceableOperation {
private final LineAttributes attributes;

SetLineAttributesOperation(LineAttributes attributes) {
Expand Down Expand Up @@ -5432,7 +5432,7 @@ public void setLineCap(int cap) {
storeAndApplyOperationForExistingHandle(new SetLineCapOperation(cap));
}

private class SetLineCapOperation extends Operation {
private class SetLineCapOperation extends ReplaceableOperation {
private final int cap;

SetLineCapOperation(int cap) {
Expand Down Expand Up @@ -5477,7 +5477,7 @@ public void setLineDash(int[] dashes) {
storeAndApplyOperationForExistingHandle(new SetLineDashOperation(dashes));
}

private class SetLineDashOperation extends Operation {
private class SetLineDashOperation extends ReplaceableOperation {
private final int[] dashes;

SetLineDashOperation(int[] dashes) {
Expand Down Expand Up @@ -5529,7 +5529,7 @@ public void setLineJoin(int join) {
storeAndApplyOperationForExistingHandle(new SetLineJoinOperation(join));
}

private class SetLineJoinOperation extends Operation {
private class SetLineJoinOperation extends ReplaceableOperation {
private final int join;

SetLineJoinOperation(int join) {
Expand Down Expand Up @@ -5572,7 +5572,7 @@ public void setLineStyle(int lineStyle) {
storeAndApplyOperationForExistingHandle(new SetLineStyleOperation(lineStyle));
}

private class SetLineStyleOperation extends Operation {
private class SetLineStyleOperation extends ReplaceableOperation {
private final int lineStyle;

SetLineStyleOperation(int lineStyle) {
Expand Down Expand Up @@ -5626,7 +5626,7 @@ public void setLineWidth(int lineWidth) {
storeAndApplyOperationForExistingHandle(new SetLineWidthOperation(lineWidth));
}

private class SetLineWidthOperation extends Operation {
private class SetLineWidthOperation extends ReplaceableOperation {
private final int width;

SetLineWidthOperation(int width) {
Expand Down Expand Up @@ -6042,10 +6042,23 @@ int getZoom() {
}

private void storeAndApplyOperationForExistingHandle(Operation operation) {
removePreviousOperationIfSupercededBy(operation);
operations.add(operation);
operation.apply();
}

private void removePreviousOperationIfSupercededBy(Operation operation) {
if (operations.isEmpty()) {
return;
}
int lastIndex = operations.size() - 1;
Operation lastOperation = operations.get(lastIndex);
if (lastOperation.canBeReplacedBy(operation)) {
lastOperation.disposeAll();
operations.remove(lastIndex);
}
}

private void createGcHandle(Drawable drawable, GCData newData) {
long newHandle = drawable.internal_new_GC(newData);
if (newHandle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
Expand Down Expand Up @@ -6085,6 +6098,17 @@ void disposeAll() {
}
disposables.clear();
}

boolean canBeReplacedBy(Operation operation) {
return false;
}
}

private abstract class ReplaceableOperation extends Operation {
@Override
boolean canBeReplacedBy(Operation operation) {
return operation.getClass().equals(this.getClass());
}
}
}

Loading