Skip to content

[Win32] Reuse zoom handle for drawing image at size if appropriate #2634

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
wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −34
Open

[Win32] Reuse zoom handle for drawing image at size if appropriate #2634

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
82 changes: 48 additions & 34 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 @@ -141,30 +141,66 @@ public final class Image extends Resource implements Drawable {

private List<Consumer<Image>> onDisposeListeners;

private record CachedHandle(ImageHandle handleContainer, int requestedWidth, int requestedHeight) {
private class HandleAtSize {
private ImageHandle handleContainer = null;
private int requestedWidth = -1;
private int requestedHeight = -1;

public void destroy() {
if (handleContainer != null) {
if (handleContainer != null && !zoomLevelToImageHandle.containsValue(handleContainer)) {
handleContainer.destroy();
}
handleContainer = null;
requestedWidth = -1;
requestedHeight = -1;
}

public boolean isReusable(int height, int width) {
if(handleContainer == null) {
public ImageHandle refresh(int width, int height) {
if (!isReusable(width, height)) {
destroy();
requestedWidth = width;
requestedHeight = height;
handleContainer = createHandleAtExactSize(width, height)
.orElseGet(() -> getOrCreateImageHandleAtClosestSize(width, height));
}
return handleContainer;
}

private boolean isReusable(int width, int height) {
if (handleContainer == null) {
return false;
}
return (requestedHeight == height && requestedWidth == width)
|| (handleContainer.height == height && handleContainer.width == width);
}

private Optional<ImageHandle> createHandleAtExactSize(int widthHint, int heightHint) {
Optional<ImageData> imageData = imageProvider.loadImageDataAtExactSize(widthHint, heightHint);
if (imageData.isPresent()) {
ImageData adaptedData = adaptImageDataIfDisabledOrGray(imageData.get());
ImageHandle imageHandle = init(adaptedData, -1);
return Optional.of(imageHandle);
}
return Optional.empty();
}

public ImageHandle getHandle() {
return handleContainer;
private ImageHandle getOrCreateImageHandleAtClosestSize(int widthHint, int heightHint) {
Rectangle bounds = getBounds(100);
int imageZoomForWidth = 100 * widthHint / bounds.width;
int imageZoomForHeight = 100 * heightHint / bounds.height;
int imageZoom = DPIUtil.getZoomForAutoscaleProperty(Math.max(imageZoomForWidth, imageZoomForHeight));
ImageHandle bestFittingHandle = zoomLevelToImageHandle.get(imageZoom);
if (bestFittingHandle == null) {
ImageData bestFittingImageData = imageProvider.loadImageData(imageZoom).element();
ImageData adaptedData = adaptImageDataIfDisabledOrGray(bestFittingImageData);
bestFittingHandle = init(adaptedData, -1);
}
return bestFittingHandle;
}
};

// Initialize lastRequestedHandle with -1 for size-related fields to indicate uninitialized values
CachedHandle lastRequestedHandle = new CachedHandle(null, -1, -1);
}

private final HandleAtSize lastRequestedHandle = new HandleAtSize();

private Image (Device device, int type, long handle, int nativeZoom) {
super(device);
Expand Down Expand Up @@ -846,14 +882,8 @@ ImageHandle getHandle (int targetZoom, int nativeZoom) {
}

void executeOnImageHandleAtBestFittingSize(Consumer<ImageHandle> handleAtSizeConsumer, int widthHint, int heightHint) {
if (!lastRequestedHandle.isReusable(heightHint, widthHint)) {
ImageData imageData;
imageData = this.imageProvider.loadImageDataAtSize(widthHint, heightHint);
lastRequestedHandle.destroy();
ImageHandle handleContainer = init(imageData, -1);
lastRequestedHandle = new CachedHandle(handleContainer, widthHint, heightHint);
}
handleAtSizeConsumer.accept(lastRequestedHandle.getHandle());
ImageHandle imageHandle = lastRequestedHandle.refresh(widthHint, heightHint);
handleAtSizeConsumer.accept(imageHandle);
}

/**
Expand Down Expand Up @@ -1088,8 +1118,8 @@ void destroy () {
}

private void destroyHandles() {
destroyHandles(__ -> true);
lastRequestedHandle.destroy();
destroyHandles(__ -> true);
}

@Override
Expand Down Expand Up @@ -1999,22 +2029,6 @@ ElementAtZoom<ImageData> getClosestAvailableImageData(int zoom) {
return new ElementAtZoom<>(getImageMetadata(new ZoomContext(closestZoom)).getImageData(), closestZoom);
}

public ImageData loadImageDataAtSize(int widthHint, int heightHint) {
Optional<ImageData> exact = loadImageDataAtExactSize(widthHint, heightHint);
if (exact.isPresent()) {
return adaptImageDataIfDisabledOrGray(exact.get());
}
return loadImageDataClosestTo(widthHint, heightHint);
}

private ImageData loadImageDataClosestTo(int targetWidth, int targetHeight) {
Rectangle bounds = getBounds(100);
int imageZoomForWidth = 100 * targetWidth / bounds.width;
int imageZoomForHeight = 100 * targetHeight / bounds.height;
int imageZoom = DPIUtil.getZoomForAutoscaleProperty(Math.max(imageZoomForWidth, imageZoomForHeight));
return loadImageData(imageZoom).element();
}

protected Optional<ImageData> loadImageDataAtExactSize(int width, int height) {
return Optional.empty(); // exact size not available
}
Expand Down
Loading