Skip to content

[Win32] Remove obsolete zoom parameter for refreshing GC handle #2407

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
Aug 11, 2025
+9 −11
Merged

[Win32] Remove obsolete zoom parameter for refreshing GC handle #2407

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
10 changes: 3 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 @@ -5833,15 +5833,12 @@ Point textExtentInPixels(String string, int flags) {
return new Point(rect.right, rect.bottom);
}

void refreshFor(Drawable drawable, int zoom) {
void refreshFor(Drawable drawable) {
if (drawable == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (zoom == getZoom()) {
return;
}
destroy();
GCData newData = new GCData();
originalData.copyTo(newData);
createGcHandle(drawable, newData, zoom);
createGcHandle(drawable, newData);
}

/**
Expand Down Expand Up @@ -5947,8 +5944,7 @@ private void storeAndApplyOperationForExistingHandle(Operation operation) {
operation.apply();
}

private void createGcHandle(Drawable drawable, GCData newData, int nativeZoom) {
newData.nativeZoom = nativeZoom;
private void createGcHandle(Drawable drawable, GCData newData) {
long newHandle = drawable.internal_new_GC(newData);
if (newHandle == 0) SWT.error(SWT.ERROR_NO_HANDLES);
init(drawable, newData, newHandle);
Expand Down
10 changes: 6 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2177,10 +2177,12 @@ protected ImageHandle newImageHandle(int zoom) {
return createBaseHandle(zoom);
}
if (memGC != null) {
GC currentGC = memGC;
memGC = null;
createHandle(zoom);
currentGC.refreshFor(new DrawableWrapper(Image.this, zoom), zoom);
if (memGC.getZoom() != zoom) {
GC currentGC = memGC;
memGC = null;
createHandle(zoom);
currentGC.refreshFor(new DrawableWrapper(Image.this, zoom));
}
return zoomLevelToImageHandle.get(zoom);
}
return super.newImageHandle(zoom);
Expand Down
Loading