gtk: Use Propagation for CallbackAction callback

Author: bilelmoussaoui

gtk4/Gir.toml

@@ -727,9 +727,7 @@ name = "Gtk.CallbackAction"
 status = "generate"
     [[object.function]]
     name = "new"
-        [[object.function.parameter]]
-        name = "callback"
-        nullable = false
+    manual = true # to use glib::Propagation, we don't have inhibit for callbacks
 
 [[object]]
 name = "Gtk.CellArea"

gtk4/src/auto/callback_action.rs

@@ -2,9 +2,7 @@
 // from gir-files (https://github.com/gtk-rs/gir-files)
 // DO NOT EDIT
 
-use crate::{ShortcutAction, Widget};
-use glib::translate::*;
-use std::boxed::Box as Box_;
+use crate::ShortcutAction;
 
 glib::wrapper! {
     #[doc(alias = "GtkCallbackAction")]
@@ -15,41 +13,4 @@ glib::wrapper! {
     }
 }
 
-impl CallbackAction {
-    #[doc(alias = "gtk_callback_action_new")]
-    pub fn new<P: Fn(&Widget, Option<&glib::Variant>) -> bool + 'static>(
-        callback: P,
-    ) -> CallbackAction {
-        assert_initialized_main_thread!();
-        let callback_data: Box_<P> = Box_::new(callback);
-        unsafe extern "C" fn callback_func<
-            P: Fn(&Widget, Option<&glib::Variant>) -> bool + 'static,
-        >(
-            widget: *mut ffi::GtkWidget,
-            args: *mut glib::ffi::GVariant,
-            user_data: glib::ffi::gpointer,
-        ) -> glib::ffi::gboolean {
-            let widget = from_glib_borrow(widget);
-            let args: Borrowed<Option<glib::Variant>> = from_glib_borrow(args);
-            let callback = &*(user_data as *mut P);
-            (*callback)(&widget, args.as_ref().as_ref()).into_glib()
-        }
-        let callback = Some(callback_func::<P> as _);
-        unsafe extern "C" fn destroy_func<
-            P: Fn(&Widget, Option<&glib::Variant>) -> bool + 'static,
-        >(
-            data: glib::ffi::gpointer,
-        ) {
-            let _callback = Box_::from_raw(data as *mut P);
-        }
-        let destroy_call2 = Some(destroy_func::<P> as _);
-        let super_callback0: Box_<P> = callback_data;
-        unsafe {
-            from_glib_full(ffi::gtk_callback_action_new(
-                callback,
-                Box_::into_raw(super_callback0) as *mut _,
-                destroy_call2,
-            ))
-        }
-    }
-}
+impl CallbackAction {}

gtk4/src/callback_action.rs

@@ -0,0 +1,44 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+use glib::translate::*;
+use std::boxed::Box as Box_;
+
+use crate::{CallbackAction, Widget};
+
+impl CallbackAction {
+    #[doc(alias = "gtk_callback_action_new")]
+    pub fn new<P: Fn(&Widget, Option<&glib::Variant>) -> glib::Propagation + 'static>(
+        callback: P,
+    ) -> CallbackAction {
+        assert_initialized_main_thread!();
+        let callback_data: Box_<P> = Box_::new(callback);
+        unsafe extern "C" fn callback_func<
+            P: Fn(&Widget, Option<&glib::Variant>) -> glib::Propagation + 'static,
+        >(
+            widget: *mut ffi::GtkWidget,
+            args: *mut glib::ffi::GVariant,
+            user_data: glib::ffi::gpointer,
+        ) -> glib::ffi::gboolean {
+            let widget = from_glib_borrow(widget);
+            let args: Borrowed<Option<glib::Variant>> = from_glib_borrow(args);
+            let callback = &*(user_data as *mut P);
+            (*callback)(&widget, args.as_ref().as_ref()).into_glib()
+        }
+        let callback = Some(callback_func::<P> as _);
+        unsafe extern "C" fn destroy_func<
+            P: Fn(&Widget, Option<&glib::Variant>) -> glib::Propagation + 'static,
+        >(
+            data: glib::ffi::gpointer,
+        ) {
+            let _callback = Box_::from_raw(data as *mut P);
+        }
+        let destroy_call2 = Some(destroy_func::<P> as _);
+        let super_callback0: Box_<P> = callback_data;
+        unsafe {
+            from_glib_full(ffi::gtk_callback_action_new(
+                callback,
+                Box_::into_raw(super_callback0) as *mut _,
+                destroy_call2,
+            ))
+        }
+    }
+}

gtk4/src/lib.rs

@@ -111,6 +111,7 @@ mod border;
 mod builder;
 mod builder_cscope;
 mod builder_rust_scope;
+mod callback_action;
 mod cell_area;
 mod cell_layout;
 mod closure_expression;

gtk4/src/subclass/widget.rs

@@ -1008,7 +1008,10 @@ pub unsafe trait WidgetClassExt: ClassStruct {
 
     #[doc(alias = "gtk_widget_class_add_binding")]
     fn add_binding<
-        F: Fn(&<<Self as ClassStruct>::Type as ObjectSubclass>::Type, Option<&Variant>) -> bool
+        F: Fn(
+                &<<Self as ClassStruct>::Type as ObjectSubclass>::Type,
+                Option<&Variant>,
+            ) -> glib::Propagation
             + 'static,
     >(
         &mut self,
@@ -1019,9 +1022,11 @@ pub unsafe trait WidgetClassExt: ClassStruct {
     ) {
         let shortcut = crate::Shortcut::new(
             Some(crate::KeyvalTrigger::new(keyval, mods)),
-            Some(crate::CallbackAction::new(move |widget, args| -> bool {
-                unsafe { callback(widget.unsafe_cast_ref(), args) }
-            })),
+            Some(crate::CallbackAction::new(
+                move |widget, args| -> glib::Propagation {
+                    unsafe { callback(widget.unsafe_cast_ref(), args) }
+                },
+            )),
         );
         shortcut.set_arguments(arguments);
         self.add_shortcut(&shortcut);