gdk: Seal GdkCairoContextExt and move method impls within trait defin…

…ition
gtk-rs · Aug 22, 2023 · 9b2aa39 · 9b2aa39
1 parent 2a56564
commit 9b2aa39
Showing 1 changed file with 27 additions and 33 deletions.
diff --git a/gdk4/src/cairo_interaction.rs b/gdk4/src/cairo_interaction.rs
@@ -24,41 +24,14 @@ impl GdkCairoSurfaceExt for cairo::Surface {
 
 // rustdoc-stripper-ignore-next
 /// Trait containing integration methods with [`cairo::Context`].
-pub trait GdkCairoContextExt {
+pub trait GdkCairoContextExt: sealed::Sealed {
     // rustdoc-stripper-ignore-next
     /// # Safety
     ///
     /// It's the responsibility of the caller to ensure that source
     /// is a valid GL resource.
     #[doc(alias = "gdk_cairo_draw_from_gl")]
     #[allow(clippy::too_many_arguments)]
-    unsafe fn draw_from_gl(
-        &self,
-        surface: &Surface,
-        source: i32,
-        source_type: i32,
-        buffer_scale: i32,
-        x: i32,
-        y: i32,
-        width: i32,
-        height: i32,
-    );
-
-    #[doc(alias = "gdk_cairo_set_source_rgba")]
-    #[doc(alias = "set_source_rgba")]
-    fn set_source_color(&self, rgba: &RGBA);
-
-    #[doc(alias = "gdk_cairo_set_source_pixbuf")]
-    fn set_source_pixbuf(&self, pixbuf: &Pixbuf, x: f64, y: f64);
-
-    #[doc(alias = "gdk_cairo_rectangle")]
-    fn add_rectangle(&self, rectangle: &Rectangle);
-
-    #[doc(alias = "gdk_cairo_region")]
-    fn add_region(&self, region: &Region);
-}
-
-impl GdkCairoContextExt for Context {
     unsafe fn draw_from_gl(
         &self,
         surface: &Surface,
@@ -72,7 +45,7 @@ impl GdkCairoContextExt for Context {
     ) {
         skip_assert_initialized!();
         ffi::gdk_cairo_draw_from_gl(
-            mut_override(self.to_glib_none().0),
+            self.to_raw(),
             surface.to_glib_none().0,
             source,
             source_type,
@@ -84,27 +57,48 @@ impl GdkCairoContextExt for Context {
         );
     }
 
+    #[doc(alias = "gdk_cairo_set_source_rgba")]
+    #[doc(alias = "set_source_rgba")]
     fn set_source_color(&self, rgba: &RGBA) {
         unsafe {
-            ffi::gdk_cairo_set_source_rgba(self.to_glib_none().0, rgba.to_glib_none().0);
+            ffi::gdk_cairo_set_source_rgba(self.to_raw(), rgba.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "gdk_cairo_set_source_pixbuf")]
     fn set_source_pixbuf(&self, pixbuf: &Pixbuf, x: f64, y: f64) {
         unsafe {
-            ffi::gdk_cairo_set_source_pixbuf(self.to_glib_none().0, pixbuf.to_glib_none().0, x, y);
+            ffi::gdk_cairo_set_source_pixbuf(self.to_raw(), pixbuf.to_glib_none().0, x, y);
         }
     }
 
+    #[doc(alias = "gdk_cairo_rectangle")]
     fn add_rectangle(&self, rectangle: &Rectangle) {
         unsafe {
-            ffi::gdk_cairo_rectangle(self.to_glib_none().0, rectangle.to_glib_none().0);
+            ffi::gdk_cairo_rectangle(self.to_raw(), rectangle.to_glib_none().0);
         }
     }
 
+    #[doc(alias = "gdk_cairo_region")]
     fn add_region(&self, region: &Region) {
         unsafe {
-            ffi::gdk_cairo_region(self.to_glib_none().0, region.to_glib_none().0);
+            ffi::gdk_cairo_region(self.to_raw(), region.to_glib_none().0);
+        }
+    }
+}
+
+impl GdkCairoContextExt for Context {}
+
+mod sealed {
+    use cairo::{ffi::cairo_t, Context};
+
+    pub trait Sealed {
+        fn to_raw(&self) -> *mut cairo_t;
+    }
+
+    impl Sealed for Context {
+        fn to_raw(&self) -> *mut cairo_t {
+            self.to_raw_none()
         }
     }
 }