Fix on_add for relm containers

antoyo · Apr 30, 2017 · 6257c50 · 6257c50
1 parent 50ac9c8
commit 6257c50
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ documentation = "https://docs.rs/relm/"
 license = "MIT"
 name = "relm"
 repository = "https://github.com/antoyo/relm"
-version = "0.9.1"
+version = "0.9.2"
 
 [badges]
 travis-ci = { repository = "antoyo/relm" }

diff --git a/examples/multi-container.rs b/examples/multi-container.rs
@@ -38,7 +38,7 @@ use gtk::{
 };
 use gtk::Orientation::{Horizontal, Vertical};
 use gtk::WindowType::Toplevel;
-use relm::{Component, Container, ContainerWidget, RelmContainer, RemoteRelm, Widget};
+use relm::{Cast, Component, Container, ContainerWidget, RelmContainer, RemoteRelm, Widget};
 
 use self::Msg::*;
 
@@ -160,15 +160,18 @@ impl Container for SplitBox {
         &self.hbox1
     }
 
-    fn add_widget<WIDGET: Widget>(&self, widget: &WIDGET) {
+    fn add_widget<WIDGET: Widget>(&self, widget: &WIDGET) -> gtk::Container {
         if WIDGET::data() == Some("right") {
             self.hbox3.add(widget.root());
+            self.hbox3.widget().root().clone().upcast()
         }
         else if WIDGET::data() == Some("center") {
             self.hbox2.add(widget.root());
+            self.hbox2.clone().upcast()
         }
         else {
             self.hbox1.add(widget.root());
+            self.hbox1.clone().upcast()
         }
     }
 }

diff --git a/relm-gen-widget/Cargo.toml b/relm-gen-widget/Cargo.toml
@@ -5,7 +5,7 @@ documentation = "https://docs.rs/relm-gen-widget/"
 license = "MIT"
 name = "relm-gen-widget"
 repository = "https://github.com/antoyo/relm"
-version = "0.9.7"
+version = "0.9.8"
 
 [dependencies]
 lazy_static = "^0.2.4"

diff --git a/relm-gen-widget/src/gen.rs b/relm-gen-widget/src/gen.rs
@@ -386,27 +386,33 @@ fn gen_add_widget_method(container_names: &HashMap<Option<String>, (Ident, Path)
         let mut other_containers = Tokens::new();
         for (data, &(ref name, ref typ)) in container_names {
             let first_type_part = &typ.segments.first().expect("first segment").ident;
-            let container_trait =
+            let (container_trait, upcast_container) =
                 if first_type_part == "gtk" {
-                    quote! {
+                    (quote! {
                         ::gtk::ContainerExt
-                    }
+                    }, quote! {
+                        ::relm::Cast::upcast(self.#name.clone())
+                    })
                 }
                 else {
-                    quote! {
+                    (quote! {
                         ::relm::RelmContainer
-                    }
+                    }, quote! {
+                        ::relm::Cast::upcast(self.#name.widget().root().clone())
+                    })
                 };
             if data.is_none() {
                 default_container = quote! {
                     #container_trait::add(&self.#name, widget.root());
+                    #upcast_container
                 };
             }
             else {
                 if other_containers.as_str().is_empty() {
                     other_containers = quote! {
                         if WIDGET::data() == Some(#data) {
                             #container_trait::add(&self.#name, widget.root());
+                            #upcast_container
                         }
                     };
                 }
@@ -415,6 +421,7 @@ fn gen_add_widget_method(container_names: &HashMap<Option<String>, (Ident, Path)
                         #other_containers
                         else if WIDGET::data() == Some(#data) {
                             #container_trait::add(&self.#name, widget.root());
+                            #upcast_container
                         }
                     };
                 }
@@ -428,7 +435,7 @@ fn gen_add_widget_method(container_names: &HashMap<Option<String>, (Ident, Path)
             };
         }
         quote! {
-            fn add_widget<WIDGET: Widget>(&self, widget: &WIDGET) {
+            fn add_widget<WIDGET: Widget>(&self, widget: &WIDGET) -> ::gtk::Container {
                 #other_containers
                 #default_container
             }

diff --git a/src/container.rs b/src/container.rs
@@ -19,6 +19,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+use glib::Cast;
 use gtk;
 use gtk::{ContainerExt, IsA, Object, WidgetExt};
 
@@ -29,7 +30,7 @@ use widget::Widget;
 /// Trait to implement relm container widget.
 pub trait Container: Widget {
     /// The type of the containing widget, i.e. where the child widgets will be added.
-    type Container: IsA<gtk::Container> + IsA<Object>;
+    type Container: Clone + IsA<gtk::Container> + IsA<Object>;
 
     /// Get the containing widget, i.e. the widget where the children will be added.
     fn container(&self) -> &Self::Container;
@@ -40,8 +41,10 @@ pub trait Container: Widget {
     }
 
     /// Add a relm widget to this container.
-    fn add_widget<WIDGET: Widget>(&self, widget: &WIDGET) {
-        self.container().add(widget.root());
+    fn add_widget<WIDGET: Widget>(&self, widget: &WIDGET) -> gtk::Container {
+        let container = self.container();
+        container.add(widget.root());
+        container.clone().upcast()
     }
 }
 
@@ -124,8 +127,7 @@ impl<WIDGET> RelmContainer for Component<WIDGET>
               PARENTWIDGET: Widget
     {
         let component = create_widget::<CHILDWIDGET>(&relm.remote, model_param);
-        let container = self.widget().container();
-        self.widget().add_widget(&component.widget);
+        let container = self.widget().add_widget(&component.widget);
         component.widget.on_add(container.clone());
         init_component::<CHILDWIDGET>(&component, &relm.remote);
         Component::new(component)

diff --git a/src/lib.rs b/src/lib.rs
@@ -103,6 +103,8 @@ use std::time::SystemTime;
 use futures::{Future, Stream};
 use glib::Continue;
 #[doc(hidden)]
+pub use glib::Cast;
+#[doc(hidden)]
 pub use glib::object::Downcast;
 #[doc(hidden)]
 pub use glib::translate::{FromGlibPtrNone, ToGlib};