Skip to content

[Gtk4] Support MenuItem images on GTK4 #3441

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

Draft
akurtakov wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[Gtk4] Support MenuItem images on GTK4 #3441

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
64 changes: 64 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,20 @@ JNIEXPORT void JNICALL GTK4_NATIVE(gsk_1render_1node_1unref)
}
#endif

#ifndef NO_gtk_1actionable_1set_1action_1name
JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1actionable_1set_1action_1name)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
GTK4_NATIVE_ENTER(env, that, gtk_1actionable_1set_1action_1name_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
gtk_actionable_set_action_name((GtkActionable *)arg0, (const char *)lparg1);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
GTK4_NATIVE_EXIT(env, that, gtk_1actionable_1set_1action_1name_FUNC);
}
#endif

#ifndef NO_gtk_1box_1append
JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1box_1append)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
Expand Down Expand Up @@ -2270,6 +2284,22 @@ JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1picture_1set_1paintable)
}
#endif

#ifndef NO_gtk_1popover_1menu_1add_1child
JNIEXPORT jboolean JNICALL GTK4_NATIVE(gtk_1popover_1menu_1add_1child)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2)
{
jbyte *lparg2=NULL;
jboolean rc = 0;
GTK4_NATIVE_ENTER(env, that, gtk_1popover_1menu_1add_1child_FUNC);
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
rc = (jboolean)gtk_popover_menu_add_child((GtkPopoverMenu *)arg0, (GtkWidget *)arg1, (const char *)lparg2);
fail:
if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0);
GTK4_NATIVE_EXIT(env, that, gtk_1popover_1menu_1add_1child_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1popover_1menu_1bar_1new_1from_1model
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1popover_1menu_1bar_1new_1from_1model)
(JNIEnv *env, jclass that, jlong arg0)
Expand Down Expand Up @@ -2306,6 +2336,18 @@ JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1popover_1menu_1new_1from_1model_1full)
}
#endif

#ifndef NO_gtk_1popover_1menu_1remove_1child
JNIEXPORT jboolean JNICALL GTK4_NATIVE(gtk_1popover_1menu_1remove_1child)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
jboolean rc = 0;
GTK4_NATIVE_ENTER(env, that, gtk_1popover_1menu_1remove_1child_FUNC);
rc = (jboolean)gtk_popover_menu_remove_child((GtkPopoverMenu *)arg0, (GtkWidget *)arg1);
GTK4_NATIVE_EXIT(env, that, gtk_1popover_1menu_1remove_1child_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1popover_1menu_1set_1menu_1model
JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1popover_1menu_1set_1menu_1model)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
Expand Down Expand Up @@ -2488,6 +2530,28 @@ JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1shortcut_1new)
}
#endif

#ifndef NO_gtk_1size_1group_1add_1widget
JNIEXPORT void JNICALL GTK4_NATIVE(gtk_1size_1group_1add_1widget)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
GTK4_NATIVE_ENTER(env, that, gtk_1size_1group_1add_1widget_FUNC);
gtk_size_group_add_widget((GtkSizeGroup *)arg0, (GtkWidget *)arg1);
GTK4_NATIVE_EXIT(env, that, gtk_1size_1group_1add_1widget_FUNC);
}
#endif

#ifndef NO_gtk_1size_1group_1new
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1size_1group_1new)
(JNIEnv *env, jclass that, jint arg0)
{
jlong rc = 0;
GTK4_NATIVE_ENTER(env, that, gtk_1size_1group_1new_FUNC);
rc = (jlong)gtk_size_group_new((GtkSizeGroupMode)arg0);
GTK4_NATIVE_EXIT(env, that, gtk_1size_1group_1new_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1snapshot_1append_1cairo
JNIEXPORT jlong JNICALL GTK4_NATIVE(gtk_1snapshot_1append_1cairo)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
Expand Down
5 changes: 5 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/gtk4_stats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ typedef enum {
gdk_1toplevel_1size_1set_1size_FUNC,
gsk_1render_1node_1draw_FUNC,
gsk_1render_1node_1unref_FUNC,
gtk_1actionable_1set_1action_1name_FUNC,
gtk_1box_1append_FUNC,
gtk_1box_1insert_1child_1after_FUNC,
gtk_1box_1prepend_FUNC,
Expand Down Expand Up @@ -186,9 +187,11 @@ typedef enum {
gtk_1picture_1new_FUNC,
gtk_1picture_1set_1can_1shrink_FUNC,
gtk_1picture_1set_1paintable_FUNC,
gtk_1popover_1menu_1add_1child_FUNC,
gtk_1popover_1menu_1bar_1new_1from_1model_FUNC,
gtk_1popover_1menu_1get_1menu_1model_FUNC,
gtk_1popover_1menu_1new_1from_1model_1full_FUNC,
gtk_1popover_1menu_1remove_1child_FUNC,
gtk_1popover_1menu_1set_1menu_1model_FUNC,
gtk_1popover_1new_FUNC,
gtk_1popover_1set_1autohide_FUNC,
Expand All @@ -205,6 +208,8 @@ typedef enum {
gtk_1shortcut_1controller_1remove_1shortcut_FUNC,
gtk_1shortcut_1controller_1set_1scope_FUNC,
gtk_1shortcut_1new_FUNC,
gtk_1size_1group_1add_1widget_FUNC,
gtk_1size_1group_1new_FUNC,
gtk_1snapshot_1append_1cairo_FUNC,
gtk_1snapshot_1free_1to_1node_FUNC,
gtk_1snapshot_1new_FUNC,
Expand Down
113 changes: 109 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3774,6 +3774,18 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1box_1set_1spacing)
}
#endif

#ifndef NO_gtk_1button_1get_1type
JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1button_1get_1type)
(JNIEnv *env, jclass that)
{
jlong rc = 0;
GTK_NATIVE_ENTER(env, that, gtk_1button_1get_1type_FUNC);
rc = (jlong)gtk_button_get_type();
GTK_NATIVE_EXIT(env, that, gtk_1button_1get_1type_FUNC);
return rc;
}
#endif

#ifndef NO_gtk_1button_1new
JNIEXPORT jlong JNICALL GTK_NATIVE(gtk_1button_1new)
(JNIEnv *env, jclass that)
Expand Down Expand Up @@ -7068,6 +7080,24 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1style_1context_1add_1provider)
}
#endif

#ifndef NO_gtk_1style_1context_1add_1provider_1for_1display
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1style_1context_1add_1provider_1for_1display)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2)
{
GTK_NATIVE_ENTER(env, that, gtk_1style_1context_1add_1provider_1for_1display_FUNC);
/*
gtk_style_context_add_provider_for_display((GdkDisplay *)arg0, (GtkStyleProvider *)arg1, (guint)arg2);
*/
{
GTK_LOAD_FUNCTION(fp, gtk_style_context_add_provider_for_display)
if (fp) {
((void (CALLING_CONVENTION*)(GdkDisplay *, GtkStyleProvider *, guint))fp)((GdkDisplay *)arg0, (GtkStyleProvider *)arg1, (guint)arg2);
}
}
GTK_NATIVE_EXIT(env, that, gtk_1style_1context_1add_1provider_1for_1display_FUNC);
}
#endif

#ifndef NO_gtk_1style_1context_1remove_1class
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1style_1context_1remove_1class)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
Expand Down Expand Up @@ -9424,6 +9454,28 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1realize)
}
#endif

#ifndef NO_gtk_1widget_1remove_1css_1class
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1remove_1css_1class)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
{
jbyte *lparg1=NULL;
GTK_NATIVE_ENTER(env, that, gtk_1widget_1remove_1css_1class_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
/*
gtk_widget_remove_css_class((GtkWidget *)arg0, (const char *)lparg1);
*/
{
GTK_LOAD_FUNCTION(fp, gtk_widget_remove_css_class)
if (fp) {
((void (CALLING_CONVENTION*)(GtkWidget *, const char *))fp)((GtkWidget *)arg0, (const char *)lparg1);
}
}
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
GTK_NATIVE_EXIT(env, that, gtk_1widget_1remove_1css_1class_FUNC);
}
#endif

#ifndef NO_gtk_1widget_1set_1can_1focus
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1can_1focus)
(JNIEnv *env, jclass that, jlong arg0, jboolean arg1)
Expand Down Expand Up @@ -9630,6 +9682,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1size_1request)
}
#endif

#ifndef NO_gtk_1widget_1set_1state_1flags
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1state_1flags)
(JNIEnv *env, jclass that, jlong arg0, jint arg1, jboolean arg2)
{
GTK_NATIVE_ENTER(env, that, gtk_1widget_1set_1state_1flags_FUNC);
gtk_widget_set_state_flags((GtkWidget *)arg0, (GtkStateFlags)arg1, arg2);
GTK_NATIVE_EXIT(env, that, gtk_1widget_1set_1state_1flags_FUNC);
}
#endif

#ifndef NO_gtk_1widget_1set_1tooltip_1text
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1set_1tooltip_1text)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
Expand Down Expand Up @@ -9684,6 +9746,16 @@ JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1unparent)
}
#endif

#ifndef NO_gtk_1widget_1unset_1state_1flags
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1widget_1unset_1state_1flags)
(JNIEnv *env, jclass that, jlong arg0, jint arg1)
{
GTK_NATIVE_ENTER(env, that, gtk_1widget_1unset_1state_1flags_FUNC);
gtk_widget_unset_state_flags((GtkWidget *)arg0, (GtkStateFlags)arg1);
GTK_NATIVE_EXIT(env, that, gtk_1widget_1unset_1state_1flags_FUNC);
}
#endif

#ifndef NO_gtk_1window_1fullscreen
JNIEXPORT void JNICALL GTK_NATIVE(gtk_1window_1fullscreen)
(JNIEnv *env, jclass that, jlong arg0)
Expand Down Expand Up @@ -11984,6 +12056,20 @@ JNIEXPORT void JNICALL OS_NATIVE(g_1menu_1item_1set_1attribute)
}
#endif

#ifndef NO_g_1menu_1item_1set_1attribute_1value
JNIEXPORT void JNICALL OS_NATIVE(g_1menu_1item_1set_1attribute_1value)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2)
{
jbyte *lparg1=NULL;
OS_NATIVE_ENTER(env, that, g_1menu_1item_1set_1attribute_1value_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
g_menu_item_set_attribute_value((GMenuItem *)arg0, (const gchar *)lparg1, (GVariant *)arg2);
fail:
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
OS_NATIVE_EXIT(env, that, g_1menu_1item_1set_1attribute_1value_FUNC);
}
#endif

#ifndef NO_g_1menu_1item_1set_1label
JNIEXPORT void JNICALL OS_NATIVE(g_1menu_1item_1set_1label)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
Expand Down Expand Up @@ -12076,14 +12162,33 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1object_1get_1qdata)
}
#endif

#ifndef NO_g_1object_1new
JNIEXPORT jlong JNICALL OS_NATIVE(g_1object_1new)
#ifndef NO_g_1object_1new__JJ
JNIEXPORT jlong JNICALL OS_NATIVE(g_1object_1new__JJ)
(JNIEnv *env, jclass that, jlong arg0, jlong arg1)
{
jlong rc = 0;
OS_NATIVE_ENTER(env, that, g_1object_1new_FUNC);
OS_NATIVE_ENTER(env, that, g_1object_1new__JJ_FUNC);
rc = (jlong)g_object_new((GType)arg0, (const gchar *)arg1);
OS_NATIVE_EXIT(env, that, g_1object_1new_FUNC);
OS_NATIVE_EXIT(env, that, g_1object_1new__JJ_FUNC);
return rc;
}
#endif

#ifndef NO_g_1object_1new__J_3B_3BJ
JNIEXPORT jlong JNICALL OS_NATIVE(g_1object_1new__J_3B_3BJ)
(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jlong arg3)
{
jbyte *lparg1=NULL;
jbyte *lparg2=NULL;
jlong rc = 0;
OS_NATIVE_ENTER(env, that, g_1object_1new__J_3B_3BJ_FUNC);
if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail;
rc = (jlong)g_object_new((GType)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)NULL);
fail:
if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, JNI_ABORT);
if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, JNI_ABORT);
OS_NATIVE_EXIT(env, that, g_1object_1new__J_3B_3BJ_FUNC);
return rc;
}
#endif
Expand Down
9 changes: 8 additions & 1 deletion bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ typedef enum {
gtk_1box_1new_FUNC,
gtk_1box_1set_1homogeneous_FUNC,
gtk_1box_1set_1spacing_FUNC,
gtk_1button_1get_1type_FUNC,
gtk_1button_1new_FUNC,
gtk_1button_1set_1label_FUNC,
gtk_1button_1set_1use_1underline_FUNC,
Expand Down Expand Up @@ -567,6 +568,7 @@ typedef enum {
gtk_1spin_1button_1update_FUNC,
gtk_1style_1context_1add_1class_FUNC,
gtk_1style_1context_1add_1provider_FUNC,
gtk_1style_1context_1add_1provider_1for_1display_FUNC,
gtk_1style_1context_1remove_1class_FUNC,
gtk_1style_1context_1restore_FUNC,
gtk_1style_1context_1save_FUNC,
Expand Down Expand Up @@ -751,6 +753,7 @@ typedef enum {
gtk_1widget_1queue_1draw_FUNC,
gtk_1widget_1queue_1resize_FUNC,
gtk_1widget_1realize_FUNC,
gtk_1widget_1remove_1css_1class_FUNC,
gtk_1widget_1set_1can_1focus_FUNC,
gtk_1widget_1set_1default_1direction_FUNC,
gtk_1widget_1set_1direction_FUNC,
Expand All @@ -766,11 +769,13 @@ typedef enum {
gtk_1widget_1set_1receives_1default_FUNC,
gtk_1widget_1set_1sensitive_FUNC,
gtk_1widget_1set_1size_1request_FUNC,
gtk_1widget_1set_1state_1flags_FUNC,
gtk_1widget_1set_1tooltip_1text_FUNC,
gtk_1widget_1set_1valign_FUNC,
gtk_1widget_1set_1vexpand_FUNC,
gtk_1widget_1set_1visible_FUNC,
gtk_1widget_1unparent_FUNC,
gtk_1widget_1unset_1state_1flags_FUNC,
gtk_1window_1fullscreen_FUNC,
gtk_1window_1get_1default_1size_FUNC,
gtk_1window_1get_1default_1widget_FUNC,
Expand Down Expand Up @@ -969,14 +974,16 @@ typedef enum {
g_1menu_1item_1new_1section_FUNC,
g_1menu_1item_1new_1submenu_FUNC,
g_1menu_1item_1set_1attribute_FUNC,
g_1menu_1item_1set_1attribute_1value_FUNC,
g_1menu_1item_1set_1label_FUNC,
g_1menu_1item_1set_1submenu_FUNC,
g_1menu_1new_FUNC,
g_1menu_1remove_FUNC,
g_1object_1get__J_3B_3IJ_FUNC,
g_1object_1get__J_3B_3JJ_FUNC,
g_1object_1get_1qdata_FUNC,
g_1object_1new_FUNC,
g_1object_1new__JJ_FUNC,
g_1object_1new__J_3B_3BJ_FUNC,
g_1object_1notify_FUNC,
g_1object_1ref_FUNC,
g_1object_1ref_1sink_FUNC,
Expand Down
24 changes: 24 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTK.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ public class GTK extends OS {


/* GtkButton */
public static final native long gtk_button_get_type();
public static final native long gtk_button_new();
/**
* @method flags=dynamic
Expand Down Expand Up @@ -1038,6 +1039,13 @@ public class GTK extends OS {
* @param priority cast=(guint)
*/
public static final native void gtk_style_context_add_provider(long context, long provider, int priority);
/**
* @method flags=dynamic
* @param display cast=(GdkDisplay *)
* @param provider cast=(GtkStyleProvider *)
* @param priority cast=(guint)
*/
public static final native void gtk_style_context_add_provider_for_display(long display, long provider, int priority);
/**
* @param context cast=(GtkStyleContext *)
* @param class_name cast=(const gchar *)
Expand Down Expand Up @@ -2270,6 +2278,16 @@ public class GTK extends OS {
public static final native void gtk_widget_set_margin_bottom(long widget, int margin);
/** @param self cast=(GtkWidget *) */
public static final native int gtk_widget_get_state_flags(long self);
/**
* @param widget cast=(GtkWidget *)
* @param flags cast=(GtkStateFlags)
*/
public static final native void gtk_widget_unset_state_flags(long widget, int flags);
/**
* @param widget cast=(GtkWidget *)
* @param flags cast=(GtkStateFlags)
*/
public static final native void gtk_widget_set_state_flags(long widget, int flags, boolean clear);
/** @param widget cast=(GtkWidget *) */
public static final native boolean gtk_widget_has_default(long widget);

Expand All @@ -2281,6 +2299,12 @@ public class GTK extends OS {
* @param css_class cast=(const char *)
* */
public static final native void gtk_widget_add_css_class(long widget, byte[] css_class);
/**
* @method flags=dynamic
* @param widget cast=(GtkWidget *)
* @param css_class cast=(const char *)
* */
public static final native void gtk_widget_remove_css_class(long widget, byte[] css_class);
/** @param widget cast=(GtkWidget *) */
public static final native boolean gtk_widget_child_focus(long widget, int direction);
/**
Expand Down
Loading
Loading