Skip to content

Commit 83bece3

Browse files
Theo-Dann-Muirhead-RenesasTheo-Dann-Muirhead-Renesas
committed
MenuItem.ImageSet() GTK4 fix.
1 parent 51c3eb0 commit 83bece3

File tree

3 files changed

+127
-15
lines changed
  • bundles/org.eclipse.swt

3 files changed

+127
-15
lines changed

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,26 @@ JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1box_1prepend)
319319
}
320320
#endif
321321

322+
#ifndef NO_gtk_1box_1remove
323+
JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1box_1remove)
324+
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
325+
{
326+
GTK4_NATIVE_ENTER(env, that, gtk_1box_1remove_FUNC);
327+
gtk_box_remove((GtkBox *)arg0, (GtkWidget *)arg1);
328+
GTK4_NATIVE_EXIT(env, that, gtk_1box_1remove_FUNC);
329+
}
330+
#endif
331+
332+
#ifndef NO_gtk_1box_1reorder_1child_1after
333+
JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1box_1reorder_1child_1after)
334+
(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2)
335+
{
336+
GTK4_NATIVE_ENTER(env, that, gtk_1box_1reorder_1child_1after_FUNC);
337+
gtk_box_reorder_child_after((GtkBox *)arg0, (GtkWidget *)arg1, (GtkWidget *)arg2);
338+
GTK4_NATIVE_EXIT(env, that, gtk_1box_1reorder_1child_1after_FUNC);
339+
}
340+
#endif
341+
322342
#ifndef NO_gtk_1button_1new_1from_1icon_1name
323343
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1button_1new_1from_1icon_1name)
324344
(JNIEnv *env, jclass that, jbyteArray arg0)
@@ -707,6 +727,18 @@ JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1editable_1get_1delegate)
707727
}
708728
#endif
709729

730+
#ifndef NO_gtk_1editable_1get_1max_1width_1chars
731+
JNIEXPORT jint JNICALL GTK4_NATIVE(gtk_1editable_1get_1max_1width_1chars)
732+
(JNIEnv *env, jclass that, jlong arg0)
733+
{
734+
jint rc = 0;
735+
GTK4_NATIVE_ENTER(env, that, gtk_1editable_1get_1max_1width_1chars_FUNC);
736+
rc = (jint)gtk_editable_get_max_width_chars((GtkEditable *)arg0);
737+
GTK4_NATIVE_EXIT(env, that, gtk_1editable_1get_1max_1width_1chars_FUNC);
738+
return rc;
739+
}
740+
#endif
741+
710742
#ifndef NO_gtk_1editable_1get_1text
711743
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1editable_1get_1text)
712744
(JNIEnv *env, jclass that, jlong arg0)
@@ -719,6 +751,16 @@ JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1editable_1get_1text)
719751
}
720752
#endif
721753

754+
#ifndef NO_gtk_1editable_1set_1max_1width_1chars
755+
JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1editable_1set_1max_1width_1chars)
756+
(JNIEnv *env, jclass that, jlong arg0, jint arg1)
757+
{
758+
GTK4_NATIVE_ENTER(env, that, gtk_1editable_1set_1max_1width_1chars_FUNC);
759+
gtk_editable_set_max_width_chars((GtkEditable *)arg0, (int)arg1);
760+
GTK4_NATIVE_EXIT(env, that, gtk_1editable_1set_1max_1width_1chars_FUNC);
761+
}
762+
#endif
763+
722764
#ifndef NO_gtk_1entry_1buffer_1get_1text
723765
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1entry_1buffer_1get_1text)
724766
(JNIEnv *env, jclass that, jlong arg0)
@@ -1517,6 +1559,18 @@ JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1image_1new_1from_1icon_1name)
15171559
}
15181560
#endif
15191561

1562+
#ifndef NO_gtk_1image_1new_1from_1paintable
1563+
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1image_1new_1from_1paintable)
1564+
(JNIEnv *env, jclass that, jlong arg0)
1565+
{
1566+
jlong rc = 0;
1567+
GTK4_NATIVE_ENTER(env, that, gtk_1image_1new_1from_1paintable_FUNC);
1568+
rc = (jlong)gtk_image_new_from_paintable((GdkPaintable *)arg0);
1569+
GTK4_NATIVE_EXIT(env, that, gtk_1image_1new_1from_1paintable_FUNC);
1570+
return rc;
1571+
}
1572+
#endif
1573+
15201574
#ifndef NO_gtk_1image_1set_1from_1icon_1name
15211575
JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1image_1set_1from_1icon_1name)
15221576
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)

‎bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk4/GTK4.java‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ public class GTK4 {
7070
* @param child cast=(GtkWidget *)
7171
*/
7272
public static final native void gtk_box_prepend(long box, long child);
73+
/**
74+
* @param box cast=(GtkBox *)
75+
* @param child cast=(GtkWidget *)
76+
* @param sibling cast=(GtkWidget *)
77+
*/
78+
public static final native void gtk_box_reorder_child_after(long box, long child, long sibling);
79+
/**
80+
* @param box cast=(GtkBox *)
81+
* @param child cast=(GtkWidget *)
82+
*/
83+
public static final native void gtk_box_remove(long box, long child);
7384
/**
7485
* @param box cast=(GtkBox *)
7586
* @param child cast=(GtkWidget *)
@@ -120,6 +131,15 @@ public class GTK4 {
120131
public static final native long gtk_editable_get_text(long editable);
121132
/** @param editable cast=(GtkEditable *) */
122133
public static final native long gtk_editable_get_delegate(long editable);
134+
/**
135+
* @param editable cast=(GtkEditable *)
136+
*/
137+
public static final native int gtk_editable_get_max_width_chars(long editable);
138+
/**
139+
* @param editable cast=(GtkEditable *)
140+
* @param chars cast=(int)
141+
*/
142+
public static final native void gtk_editable_set_max_width_chars(long editable, int chars);
123143

124144
/* GtkPicture */
125145
public static final native long gtk_picture_new();
@@ -702,6 +722,8 @@ public class GTK4 {
702722
public static final native void gtk_image_set_from_paintable(long image, long paintable);
703723
/** @param icon_name cast=(const char *) */
704724
public static final native long gtk_image_new_from_icon_name(byte[] icon_name);
725+
/** @param paintable cast=(GdkPaintable *) */
726+
public static final native long gtk_image_new_from_paintable(long paintable);
705727
/**
706728
* @param image cast=(GtkImage *)
707729
* @param icon_name cast=(const gchar *)
@@ -860,5 +882,4 @@ public class GTK4 {
860882
* @param gesture cast=(GtkGesture *)
861883
*/
862884
public static final native long gtk_gesture_get_last_updated_sequence(long gesture);
863-
864885
}

‎bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,9 +1027,6 @@ public void setID (int id) {
10271027
*/
10281028
@Override
10291029
public void setImage (Image image) {
1030-
//TODO: GTK4 Menu images with text are no longer supported
1031-
if (GTK.GTK4) return;
1032-
10331030
checkWidget();
10341031
if (this.image == image) return;
10351032
if ((style & SWT.SEPARATOR) != 0) return;
@@ -1052,24 +1049,64 @@ private void _setImage (Image image) {
10521049
imageList.put (imageIndex, image);
10531050
surface = imageList.getSurface (imageIndex);
10541051
}
1055-
1056-
if (!GTK3.GTK_IS_MENU_ITEM (handle)) return;
1057-
if (OS.SWT_PADDED_MENU_ITEMS && imageHandle != 0) {
1058-
GTK3.gtk_image_set_from_surface(imageHandle, surface);
1059-
} else {
1060-
if (imageHandle == 0) {
1061-
imageHandle = GTK3.gtk_image_new_from_surface(surface);
1062-
if (imageHandle == 0) error(SWT.ERROR_NO_HANDLES);
1063-
1064-
GTK3.gtk_container_add(boxHandle, imageHandle);
1065-
GTK3.gtk_box_reorder_child(boxHandle, imageHandle, 0);
1052+
if (GTK.GTK4) {
1053+
if (OS.SWT_PADDED_MENU_ITEMS && imageHandle != 0) {
1054+
long pixbuf = ImageList.createPixbuf(image);
1055+
long texture = GDK.gdk_texture_new_for_pixbuf(pixbuf);
1056+
OS.g_object_unref(pixbuf);
1057+
GTK4.gtk_image_set_from_paintable(imageHandle, texture);
10661058
} else {
1059+
if (imageHandle == 0) {
1060+
long pixbuf = ImageList.createPixbuf(image);
1061+
long texture = GDK.gdk_texture_new_for_pixbuf(pixbuf);
1062+
OS.g_object_unref(pixbuf);
1063+
GTK4.gtk_image_new_from_paintable(texture);
1064+
if (imageHandle == 0) error(SWT.ERROR_NO_HANDLES);
1065+
1066+
GTK4.gtk_box_append(boxHandle, imageHandle);
1067+
GTK4.gtk_box_reorder_child_after(boxHandle, imageHandle, 0);
1068+
} else {
1069+
long pixbuf = ImageList.createPixbuf(image);
1070+
long texture = GDK.gdk_texture_new_for_pixbuf(pixbuf);
1071+
OS.g_object_unref(pixbuf);
1072+
GTK4.gtk_image_set_from_paintable(imageHandle, texture);
1073+
}
1074+
}
1075+
return;
1076+
} else {
1077+
if (!GTK3.GTK_IS_MENU_ITEM (handle)) return;
1078+
if (OS.SWT_PADDED_MENU_ITEMS && imageHandle != 0) {
10671079
GTK3.gtk_image_set_from_surface(imageHandle, surface);
1080+
} else {
1081+
if (imageHandle == 0) {
1082+
imageHandle = GTK3.gtk_image_new_from_surface(surface);
1083+
if (imageHandle == 0) error(SWT.ERROR_NO_HANDLES);
1084+
1085+
GTK3.gtk_container_add(boxHandle, imageHandle);
1086+
GTK3.gtk_box_reorder_child(boxHandle, imageHandle, 0);
1087+
} else {
1088+
GTK3.gtk_image_set_from_surface(imageHandle, surface);
1089+
}
10681090
}
10691091
}
10701092
gtk_widget_show(imageHandle);
10711093
} else {
10721094
if (imageHandle != 0) {
1095+
if (GTK.GTK4) {
1096+
if (OS.SWT_PADDED_MENU_ITEMS) {
1097+
GTK4.gtk_box_remove(boxHandle, imageHandle);
1098+
imageHandle = GTK.gtk_image_new ();
1099+
if (imageHandle == 0) error (SWT.ERROR_NO_HANDLES);
1100+
GTK.gtk_image_set_pixel_size (imageHandle, 16);
1101+
GTK4.gtk_box_append (boxHandle, imageHandle);
1102+
GTK4.gtk_box_append(boxHandle, labelHandle);
1103+
gtk_widget_show (imageHandle);
1104+
} else {
1105+
GTK4.gtk_box_remove(boxHandle, imageHandle);
1106+
imageHandle = 0;
1107+
}
1108+
return;
1109+
}
10731110
if (OS.SWT_PADDED_MENU_ITEMS) {
10741111
GTK3.gtk_container_remove(boxHandle, imageHandle);
10751112
imageHandle = GTK.gtk_image_new ();

0 commit comments

Comments
 (0)