Merge pull request #724 from sdroege/0.15-backports

0.15 backports

Author: sdroege

.github/workflows/docs.yml

@@ -37,7 +37,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: doc
-          args: -p atk -p atk-sys -p gdk -p gdk-sys -p gdkx11 -p gdkx11-sys -p gtk -p gtk3-macros -p gtk-sys --features dox --no-deps
+          args: -p atk -p atk-sys -p gdk -p gdk-sys -p gdkx11 -p gdkx11-sys -p gtk -p gtk3-macros -p gtk-sys -p gdkwayland -p gdkwayland-sys --features dox --no-deps
       - run: echo "RELEASE=$(echo '${{ github.event.release.tag_name }}' | grep -Po '(\d+)\.(\d+)')" >> ${GITHUB_ENV}
       - run: echo "DEST=stable/0.15" >> ${GITHUB_ENV}
       - name: Grab gtk-rs LOGO

examples/basic_subclass/simple_application/imp.rs

@@ -29,8 +29,8 @@ impl ApplicationImpl for SimpleApplication {
     /// aksed to present itself.
     fn activate(&self, app: &Self::Type) {
         let app = app.downcast_ref::<super::SimpleApplication>().unwrap();
-        let priv_ = SimpleApplication::from_instance(app);
-        let window = priv_
+        let imp = app.imp();
+        let window = imp
             .window
             .get()
             .expect("Should always be initiliazed in gio_application_startup");
@@ -49,10 +49,9 @@ impl ApplicationImpl for SimpleApplication {
         self.parent_startup(app);
 
         let app = app.downcast_ref::<super::SimpleApplication>().unwrap();
-        let priv_ = SimpleApplication::from_instance(app);
+        let imp = app.imp();
         let window = SimpleWindow::new(app);
-        priv_
-            .window
+        imp.window
             .set(window)
             .expect("Failed to initialize application window");
     }

examples/basic_subclass/simple_window/imp.rs

@@ -41,8 +41,8 @@ impl ObjectImpl for SimpleWindow {
         // Connect our method `on_increment_clicked` to be called
         // when the increment button is clicked.
         increment.connect_clicked(clone!(@weak obj => move |_| {
-            let priv_ = SimpleWindow::from_instance(&obj);
-            priv_.on_increment_clicked();
+            let imp = obj.imp();
+            imp.on_increment_clicked();
         }));
 
         obj.add(&label);

examples/composite_template/example_application_window/mod.rs

@@ -18,9 +18,8 @@ impl ExampleApplicationWindow {
     fn init_label(&self) {
         // To access fields such as template children, you must get
         // the private struct.
-        let self_ = imp::ExampleApplicationWindow::from_instance(self);
-        self_
-            .subtitle
+        let imp = self.imp();
+        imp.subtitle
             .set_text("This is an example window made using composite templates");
     }
 }

examples/list_box_model/model/mod.rs

@@ -19,12 +19,12 @@ impl Model {
     }
 
     pub fn append(&self, obj: &RowData) {
-        let self_ = imp::Model::from_instance(self);
+        let imp = self.imp();
         let index = {
             // Borrow the data only once and ensure the borrow guard is dropped
             // before we emit the items_changed signal because the view
             // could call get_item / get_n_item from the signal handler to update its state
-            let mut data = self_.0.borrow_mut();
+            let mut data = imp.0.borrow_mut();
             data.push(obj.clone());
             data.len() - 1
         };
@@ -33,8 +33,8 @@ impl Model {
     }
 
     pub fn remove(&self, index: u32) {
-        let self_ = imp::Model::from_instance(self);
-        self_.0.borrow_mut().remove(index as usize);
+        let imp = self.imp();
+        imp.0.borrow_mut().remove(index as usize);
         // Emits a signal that 1 item was removed, 0 added at the position index
         self.items_changed(index, 1, 0);
     }

gdk/src/geometry.rs

@@ -10,6 +10,38 @@ glib::wrapper! {
 }
 
 impl Geometry {
+    #[allow(clippy::too_many_arguments)]
+    pub fn new(
+        min_width: i32,
+        min_height: i32,
+        max_width: i32,
+        max_height: i32,
+        base_width: i32,
+        base_height: i32,
+        width_inc: i32,
+        height_inc: i32,
+        min_aspect: f64,
+        max_aspect: f64,
+        win_gravity: Gravity,
+    ) -> Self {
+        assert_initialized_main_thread!();
+        unsafe {
+            Geometry::unsafe_from(ffi::GdkGeometry {
+                min_width,
+                min_height,
+                max_width,
+                max_height,
+                base_width,
+                base_height,
+                width_inc,
+                height_inc,
+                min_aspect,
+                max_aspect,
+                win_gravity: win_gravity.into_glib(),
+            })
+        }
+    }
+
     pub fn min_width(&self) -> i32 {
         self.inner.min_width
     }

gdkwayland/src/lib.rs

@@ -1,7 +1,9 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
 #![doc = include_str!("../README.md")]
 
+pub use ffi;
 pub use gdk;
 
 mod wayland_device;

gdkwayland/sys/src/lib.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(feature = "dox", feature(doc_cfg))]
+
 use gdk::{GdkAtom, GdkDevicePadFeature};
 use glib::{gpointer, GType};
 use libc::{c_char, c_int, c_uint};

gtk/Gir.toml

@@ -2276,6 +2276,8 @@ manual_traits = ["TextBufferExtManual"]
 name = "Gtk.TextIter"
 status = "generate"
 boxed_inline = true
+    [[object.derive]]
+    name = "Debug"
     [[object.function]]
     name = "get_attributes"
     manual = true
@@ -2394,6 +2396,8 @@ generate_builder = true
 name = "Gtk.TreeIter"
 status = "generate"
 boxed_inline = true
+    [[object.derive]]
+    name = "Debug"
 
 [[object]]
 name = "Gtk.TreeModel"

gtk/src/auto/text_iter.rs

@@ -12,6 +12,7 @@ use glib::translate::*;
 use std::cmp;
 
 glib::wrapper! {
+    #[derive(Debug)]
     pub struct TextIter(BoxedInline<ffi::GtkTextIter>);
 
     match fn {