gtk/gdk: mark Snapshot as not final and implement necessary traits

bilelmoussaoui · bilelmoussaoui · commit 7272effec324 · 2022-10-12T14:21:06.000+02:00
Fixes #799
diff --git a/examples/custom_paintable/custom_paintable/imp.rs b/examples/custom_paintable/custom_paintable/imp.rs
@@ -29,7 +29,6 @@ impl PaintableImpl for CustomPaintable {
     }
 
     fn snapshot(&self, snapshot: &gdk::Snapshot, width: f64, height: f64) {
-        let snapshot = snapshot.downcast_ref::<gtk::Snapshot>().unwrap();
         // Draw a linear gradient
         snapshot.append_linear_gradient(
             &graphene::Rect::new(0.0, 0.0, width as f32, height as f32),
diff --git a/gdk4-wayland/src/auto/versions.txt b/gdk4-wayland/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)
+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)
diff --git a/gdk4-wayland/sys/versions.txt b/gdk4-wayland/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)
+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)
diff --git a/gdk4-x11/src/auto/versions.txt b/gdk4-x11/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)
+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)
diff --git a/gdk4-x11/sys/versions.txt b/gdk4-x11/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)
+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)
diff --git a/gdk4/Gir.toml b/gdk4/Gir.toml
@@ -53,7 +53,6 @@ generate = [
     "Gdk.ScrollEvent",
     "Gdk.ScrollUnit",
     "Gdk.SeatCapabilities",
-    "Gdk.Snapshot",
     "Gdk.SubpixelLayout",
     "Gdk.SurfaceEdge",
     "Gdk.TextureError",
@@ -559,6 +558,11 @@ name = "Gdk.Seat"
 status = "generate"
 final_type = false
 
+[[object]]
+name = "Gdk.Snapshot"
+status = "generate"
+final_type = false
+
 [[object]]
 name = "Gdk.Surface"
 status = "generate"
diff --git a/gdk4/src/auto/paintable.rs b/gdk4/src/auto/paintable.rs
@@ -76,7 +76,7 @@ pub trait PaintableExt: 'static {
     fn invalidate_size(&self);
 
     #[doc(alias = "gdk_paintable_snapshot")]
-    fn snapshot(&self, snapshot: &Snapshot, width: f64, height: f64);
+    fn snapshot(&self, snapshot: &impl IsA<Snapshot>, width: f64, height: f64);
 
     #[doc(alias = "invalidate-contents")]
     fn connect_invalidate_contents<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
@@ -145,11 +145,11 @@ impl<O: IsA<Paintable>> PaintableExt for O {
         }
     }
 
-    fn snapshot(&self, snapshot: &Snapshot, width: f64, height: f64) {
+    fn snapshot(&self, snapshot: &impl IsA<Snapshot>, width: f64, height: f64) {
         unsafe {
             ffi::gdk_paintable_snapshot(
                 self.as_ref().to_glib_none().0,
-                snapshot.to_glib_none().0,
+                snapshot.as_ref().to_glib_none().0,
                 width,
                 height,
             );
diff --git a/gdk4/src/auto/snapshot.rs b/gdk4/src/auto/snapshot.rs
@@ -13,7 +13,9 @@ glib::wrapper! {
     }
 }
 
-impl Snapshot {}
+impl Snapshot {
+    pub const NONE: Option<&'static Snapshot> = None;
+}
 
 impl fmt::Display for Snapshot {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
diff --git a/gdk4/src/auto/versions.txt b/gdk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)
+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)
diff --git a/gdk4/sys/versions.txt b/gdk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)
+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)
diff --git a/gir b/gir
@@ -1 +1 @@
-Subproject commit b5068ede6c51f47c84ac0308d8d48110b9a6e086
+Subproject commit b3147f2b6043ee273283dc45832da8757ab654d6
diff --git a/gsk4/src/auto/versions.txt b/gsk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)
+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)
diff --git a/gsk4/sys/versions.txt b/gsk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)
+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)
 from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)
diff --git a/gtk4/Gir.toml b/gtk4/Gir.toml
@@ -1918,6 +1918,8 @@ status = "generate"
 [[object]]
 name = "Gtk.Snapshot"
 status = "generate"
+final_type = false
+manual_traits = ["SnapshotExtManual"]
     [[object.function]]
     pattern = "free_to_(node|paintable)"
     ignore = true # C convenience functions
@@ -1929,9 +1931,10 @@ status = "generate"
     manual = true # ignore format args
     [[object.function]]
     pattern = "to_(node|paintable)"
-        [[object.function.parameter]]
-        name = "snapshot"
-        move = true
+    manual = true # until we fix move config for Ext traits
+    #    [[object.function.parameter]]
+    #    name = "snapshot"
+    #    move = true
 
 [[object]]
 name = "Gtk.SortListModel"
diff --git a/gtk4/src/auto/cell_area.rs b/gtk4/src/auto/cell_area.rs
@@ -250,7 +250,7 @@ pub trait CellAreaExt: 'static {
         &self,
         context: &impl IsA<CellAreaContext>,
         widget: &impl IsA<Widget>,
-        snapshot: &Snapshot,
+        snapshot: &impl IsA<Snapshot>,
         background_area: &gdk::Rectangle,
         cell_area: &gdk::Rectangle,
         flags: CellRendererState,
@@ -805,7 +805,7 @@ impl<O: IsA<CellArea>> CellAreaExt for O {
         &self,
         context: &impl IsA<CellAreaContext>,
         widget: &impl IsA<Widget>,
-        snapshot: &Snapshot,
+        snapshot: &impl IsA<Snapshot>,
         background_area: &gdk::Rectangle,
         cell_area: &gdk::Rectangle,
         flags: CellRendererState,
@@ -816,7 +816,7 @@ impl<O: IsA<CellArea>> CellAreaExt for O {
                 self.as_ref().to_glib_none().0,
                 context.as_ref().to_glib_none().0,
                 widget.as_ref().to_glib_none().0,
-                snapshot.to_glib_none().0,
+                snapshot.as_ref().to_glib_none().0,
                 background_area.to_glib_none().0,
                 cell_area.to_glib_none().0,
                 flags.into_glib(),
diff --git a/gtk4/src/auto/cell_renderer.rs b/gtk4/src/auto/cell_renderer.rs
@@ -141,7 +141,7 @@ pub trait CellRendererExt: 'static {
     #[doc(alias = "gtk_cell_renderer_snapshot")]
     fn snapshot(
         &self,
-        snapshot: &Snapshot,
+        snapshot: &impl IsA<Snapshot>,
         widget: &impl IsA<Widget>,
         background_area: &gdk::Rectangle,
         cell_area: &gdk::Rectangle,
@@ -527,7 +527,7 @@ impl<O: IsA<CellRenderer>> CellRendererExt for O {
 
     fn snapshot(
         &self,
-        snapshot: &Snapshot,
+        snapshot: &impl IsA<Snapshot>,
         widget: &impl IsA<Widget>,
         background_area: &gdk::Rectangle,
         cell_area: &gdk::Rectangle,
@@ -536,7 +536,7 @@ impl<O: IsA<CellRenderer>> CellRendererExt for O {
         unsafe {
             ffi::gtk_cell_renderer_snapshot(
                 self.as_ref().to_glib_none().0,
-                snapshot.to_glib_none().0,
+                snapshot.as_ref().to_glib_none().0,
                 widget.as_ref().to_glib_none().0,
                 background_area.to_glib_none().0,
                 cell_area.to_glib_none().0,
diff --git a/gtk4/src/auto/mod.rs b/gtk4/src/auto/mod.rs
@@ -1122,6 +1122,7 @@ pub mod traits {
     pub use super::shortcut_action::ShortcutActionExt;
     pub use super::shortcut_manager::ShortcutManagerExt;
     pub use super::shortcut_trigger::ShortcutTriggerExt;
+    pub use super::snapshot::SnapshotExt;
     pub use super::sorter::SorterExt;
     pub use super::style_context::StyleContextExt;
     pub use super::style_provider::StyleProviderExt;
diff --git a/gtk4/src/auto/snapshot.rs b/gtk4/src/auto/snapshot.rs
diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt
diff --git a/gtk4/src/auto/widget.rs b/gtk4/src/auto/widget.rs
diff --git a/gtk4/src/prelude.rs b/gtk4/src/prelude.rs
diff --git a/gtk4/src/snapshot.rs b/gtk4/src/snapshot.rs
diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ impl PaintableImpl for CustomPaintable {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`fn snapshot(&self, snapshot: &gdk::Snapshot, width: f64, height: f64) {`
`32`		`- let snapshot = snapshot.downcast_ref::<gtk::Snapshot>().unwrap();`
`33`	`32`	`// Draw a linear gradient`
`34`	`33`	`snapshot.append_linear_gradient(`
`35`	`34`	`&graphene::Rect::new(0.0, 0.0, width as f32, height as f32),`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Generated by gir (https://github.com/gtk-rs/gir @ b5068ede6c51)`
	`1`	`+Generated by gir (https://github.com/gtk-rs/gir @ b3147f2b6043)`
`2`	`2`	`from gir-files (https://github.com/gtk-rs/gir-files @ 7fa401e3ee5d)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ glib::wrapper! {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-impl Snapshot {}`
	`16`	`+impl Snapshot {`
	`17`	`+ pub const NONE: Option<&'static Snapshot> = None;`
	`18`	`+}`
`17`	`19`
`18`	`20`	`impl fmt::Display for Snapshot {`
`19`	`21`	`fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {`