Merge pull request #804 from nacho/nacho/toggle_button

Allow subclassing ToggleButton and MenuButton

Author: GuillaumeGomez

gtk/src/subclass/menu_button.rs

@@ -0,0 +1,18 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+use glib::subclass::prelude::*;
+
+use super::toggle_button::ToggleButtonImpl;
+use crate::MenuButton;
+
+pub trait MenuButtonImpl: MenuButtonImplExt + ToggleButtonImpl {}
+
+pub trait MenuButtonImplExt: ObjectSubclass {}
+
+impl<T: MenuButtonImpl> MenuButtonImplExt for T {}
+
+unsafe impl<T: MenuButtonImpl> IsSubclassable<T> for MenuButton {
+    fn class_init(class: &mut glib::Class<Self>) {
+        Self::parent_class_init::<T>(class);
+    }
+}

gtk/src/subclass/mod.rs

@@ -24,12 +24,14 @@ pub mod header_bar;
 pub mod icon_view;
 pub mod list_box;
 pub mod list_box_row;
+pub mod menu_button;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 pub mod plug;
 pub mod scrolled_window;
 #[cfg(any(gdk_backend = "x11", feature = "dox"))]
 pub mod socket;
 pub mod stack;
+pub mod toggle_button;
 pub mod tree_view;
 pub mod widget;
 pub mod window;
@@ -64,12 +66,14 @@ pub mod prelude {
     pub use super::icon_view::{IconViewImpl, IconViewImplExt};
     pub use super::list_box::{ListBoxImpl, ListBoxImplExt};
     pub use super::list_box_row::{ListBoxRowImpl, ListBoxRowImplExt};
+    pub use super::menu_button::MenuButtonImpl;
     #[cfg(any(gdk_backend = "x11", feature = "dox"))]
     pub use super::plug::{PlugImpl, PlugImplExt};
     pub use super::scrolled_window::{ScrolledWindowImpl, ScrolledWindowImplExt};
     #[cfg(any(gdk_backend = "x11", feature = "dox"))]
     pub use super::socket::{SocketImpl, SocketImplExt};
     pub use super::stack::StackImpl;
+    pub use super::toggle_button::ToggleButtonImpl;
     pub use super::tree_view::TreeViewImpl;
     pub use super::widget::{
         CompositeTemplate, TemplateChild, WidgetClassSubclassExt, WidgetImpl, WidgetImplExt,

gtk/src/subclass/toggle_button.rs

@@ -0,0 +1,50 @@
+// Take a look at the license at the top of the repository in the LICENSE file.
+
+use glib::subclass::prelude::*;
+use glib::translate::*;
+use glib::Cast;
+
+use super::button::ButtonImpl;
+use crate::ToggleButton;
+
+pub trait ToggleButtonImpl: ToggleButtonImplExt + ButtonImpl {
+    fn toggled(&self) {
+        self.parent_toggled()
+    }
+}
+
+pub trait ToggleButtonImplExt: ObjectSubclass {
+    fn parent_toggled(&self);
+}
+
+impl<T: ToggleButtonImpl> ToggleButtonImplExt for T {
+    fn parent_toggled(&self) {
+        unsafe {
+            let data = T::type_data();
+            let parent_class = data.as_ref().parent_class() as *mut ffi::GtkToggleButtonClass;
+            if let Some(f) = (*parent_class).toggled {
+                f(self
+                    .obj()
+                    .unsafe_cast_ref::<ToggleButton>()
+                    .to_glib_none()
+                    .0)
+            }
+        }
+    }
+}
+
+unsafe impl<T: ToggleButtonImpl> IsSubclassable<T> for ToggleButton {
+    fn class_init(class: &mut glib::Class<Self>) {
+        Self::parent_class_init::<T>(class);
+
+        let klass = class.as_mut();
+        klass.toggled = Some(button_toggled::<T>);
+    }
+}
+
+unsafe extern "C" fn button_toggled<T: ToggleButtonImpl>(ptr: *mut ffi::GtkToggleButton) {
+    let instance = &*(ptr as *mut T::Instance);
+    let imp = instance.imp();
+
+    imp.toggled()
+}