gtk: Automatically generate Snapshot::to_(node|paintable) methods

bilelmoussaoui · bilelmoussaoui · commit e8c4fafb3703 · 2022-10-18T14:03:06.000+02:00
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 @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
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 @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
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 @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
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 @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
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 @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
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 @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
diff --git a/gir b/gir
@@ -1 +1 @@
-Subproject commit 0f78aff3d7f768dd13088d49489d2fca5ff5cf3f
+Subproject commit 952ff416b5997f50b9261c62c7589100e35a1459
diff --git a/gsk4/src/auto/shader_args_builder.rs b/gsk4/src/auto/shader_args_builder.rs
@@ -3,6 +3,7 @@
 // DO NOT EDIT
 
 use crate::GLShader;
+use glib::object::Cast;
 use glib::translate::*;
 
 glib::wrapper! {
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 @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
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 @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
diff --git a/gtk4/Gir.toml b/gtk4/Gir.toml
@@ -1934,10 +1934,9 @@ manual_traits = ["SnapshotExtManual"]
     manual = true # ignore format args
     [[object.function]]
     pattern = "to_(node|paintable)"
-    manual = true # until we fix move config for Ext traits
-    #    [[object.function.parameter]]
-    #    name = "snapshot"
-    #    move = true
+        [[object.function.parameter]]
+        name = "snapshot"
+        move = true
 
 [[object]]
 name = "Gtk.SortListModel"
diff --git a/gtk4/src/auto/snapshot.rs b/gtk4/src/auto/snapshot.rs
@@ -3,6 +3,7 @@
 // DO NOT EDIT
 
 use crate::StyleContext;
+use glib::object::Cast;
 use glib::object::IsA;
 use glib::translate::*;
 use std::fmt;
@@ -238,6 +239,12 @@ pub trait SnapshotExt: 'static {
     #[doc(alias = "gtk_snapshot_scale_3d")]
     fn scale_3d(&self, factor_x: f32, factor_y: f32, factor_z: f32);
 
+    #[doc(alias = "gtk_snapshot_to_node")]
+    fn to_node(self) -> Option<gsk::RenderNode>;
+
+    #[doc(alias = "gtk_snapshot_to_paintable")]
+    fn to_paintable(self, size: Option<&graphene::Size>) -> Option<gdk::Paintable>;
+
     #[doc(alias = "gtk_snapshot_transform")]
     fn transform(&self, transform: Option<&gsk::Transform>);
 
@@ -705,6 +712,19 @@ impl<O: IsA<Snapshot>> SnapshotExt for O {
         }
     }
 
+    fn to_node(self) -> Option<gsk::RenderNode> {
+        unsafe { from_glib_full(ffi::gtk_snapshot_to_node(self.upcast().into_glib_ptr())) }
+    }
+
+    fn to_paintable(self, size: Option<&graphene::Size>) -> Option<gdk::Paintable> {
+        unsafe {
+            from_glib_full(ffi::gtk_snapshot_to_paintable(
+                self.upcast().into_glib_ptr(),
+                size.to_glib_none().0,
+            ))
+        }
+    }
+
     fn transform(&self, transform: Option<&gsk::Transform>) {
         unsafe {
             ffi::gtk_snapshot_transform(self.as_ref().to_glib_none().0, transform.to_glib_none().0);
diff --git a/gtk4/src/auto/versions.txt b/gtk4/src/auto/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)
diff --git a/gtk4/src/snapshot.rs b/gtk4/src/snapshot.rs
@@ -18,12 +18,6 @@ pub trait SnapshotExtManual {
 
     #[doc(alias = "gtk_snapshot_push_debug")]
     fn push_debug(&self, message: &str);
-
-    #[doc(alias = "gtk_snapshot_to_node")]
-    fn to_node(self) -> Option<gsk::RenderNode>;
-
-    #[doc(alias = "gtk_snapshot_to_paintable")]
-    fn to_paintable(self, size: Option<&graphene::Size>) -> Option<gdk::Paintable>;
 }
 
 impl<T: IsA<Snapshot>> SnapshotExtManual for T {
@@ -50,19 +44,6 @@ impl<T: IsA<Snapshot>> SnapshotExtManual for T {
             ffi::gtk_snapshot_push_debug(self.as_ref().to_glib_none().0, message.to_glib_none().0)
         }
     }
-
-    fn to_node(self) -> Option<gsk::RenderNode> {
-        unsafe { from_glib_full(ffi::gtk_snapshot_to_node(self.upcast().into_glib_ptr())) }
-    }
-
-    fn to_paintable(self, size: Option<&graphene::Size>) -> Option<gdk::Paintable> {
-        unsafe {
-            from_glib_full(ffi::gtk_snapshot_to_paintable(
-                self.upcast().into_glib_ptr(),
-                size.to_glib_none().0,
-            ))
-        }
-    }
 }
 
 impl AsRef<Snapshot> for gdk::Snapshot {
diff --git a/gtk4/sys/versions.txt b/gtk4/sys/versions.txt
@@ -1,2 +1,2 @@
-Generated by gir (https://github.com/gtk-rs/gir @ 0f78aff3d7f7)
+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)
 from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Generated by gir (https://github.com/gtk-rs/gir @ 0f78aff3d7f7)`
	`1`	`+Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599)`
`2`	`2`	`from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362)`