Skip to content

[GTK] Fix hot image drawing in ToolItem on Gtk4 #2265

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
akurtakov merged 1 commit into from
Jun 25, 2025
Merged

[GTK] Fix hot image drawing in ToolItem on Gtk4 #2265

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
54 changes: 38 additions & 16 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,20 +762,30 @@ long gtk_enter_notify_event (long widget, long event) {
if (imageList != null) {
int index = imageList.indexOf(hotImage);
if (index != -1 && imageHandle != 0) {
if (GTK.GTK4) {
long pixbuf = ImageList.createPixbuf(hotImage);
long texture = GDK.gdk_texture_new_for_pixbuf(pixbuf);
OS.g_object_unref(pixbuf);
GTK4.gtk_image_set_from_paintable(imageHandle, texture);
} else {
GTK3.gtk_image_set_from_surface(imageHandle, imageList.getSurface(index));
}
GTK3.gtk_image_set_from_surface(imageHandle, imageList.getSurface(index));
}
}
}
return 0;
}

@Override
void gtk4_enter_event(long controller, double x, double y, long event) {
drawHotImage = (parent.style & SWT.FLAT) != 0 && hotImage != null;
if (drawHotImage) {
ImageList imageList = parent.imageList;
if (imageList != null) {
int index = imageList.indexOf(hotImage);
if (index != -1 && imageHandle != 0) {
long pixbuf = ImageList.createPixbuf(hotImage);
long texture = GDK.gdk_texture_new_for_pixbuf(pixbuf);
OS.g_object_unref(pixbuf);
GTK4.gtk_image_set_from_paintable(imageHandle, texture);
}
}
}
}

@Override
long gtk_event_after (long widget, long gdkEvent) {
int eventType = GDK.gdk_event_get_event_type(gdkEvent);
Expand Down Expand Up @@ -826,21 +836,33 @@ long gtk_leave_notify_event (long widget, long event) {
if (imageList != null) {
int index = imageList.indexOf(image);
if (index != -1 && imageHandle != 0) {
if (GTK.GTK4) {
long pixbuf = ImageList.createPixbuf(image);
long texture = GDK.gdk_texture_new_for_pixbuf(pixbuf);
OS.g_object_unref(pixbuf);
GTK4.gtk_image_set_from_paintable(imageHandle, texture);
} else {
GTK3.gtk_image_set_from_surface(imageHandle, imageList.getSurface(index));
}
GTK3.gtk_image_set_from_surface(imageHandle, imageList.getSurface(index));
}
}
}
}
return 0;
}

@Override
void gtk4_leave_event(long controller, long event) {
if (drawHotImage) {
drawHotImage = false;
if (image != null) {
ImageList imageList = parent.imageList;
if (imageList != null) {
int index = imageList.indexOf(image);
if (index != -1 && imageHandle != 0) {
long pixbuf = ImageList.createPixbuf(image);
long texture = GDK.gdk_texture_new_for_pixbuf(pixbuf);
OS.g_object_unref(pixbuf);
GTK4.gtk_image_set_from_paintable(imageHandle, texture);
}
}
}
}
}

@Override
long gtk_map (long widget) {
parent.fixZOrder ();
Expand Down
Loading