gdk: Take self by value in GLTextureBuilder for setting the color-state too

Author: sdroege

gdk4/Gir.toml

@@ -537,7 +537,7 @@ generate_builder = false
         name = "region"
         const = true
     [[object.function]]
-    pattern = "set_(context|format|has_mipmap|height|id|update_region|update_texture|width)"
+    pattern = "set_(color_state|context|format|has_mipmap|height|id|update_region|update_texture|width)"
     # Take by value and return self
     manual = true
     [[object.function]]
@@ -547,7 +547,7 @@ generate_builder = false
     name = "build"
     manual = true
     [[object.property]]
-    pattern = "(context|format|has-mipmap|height|id|sync|update-region|update-texture|width)"
+    pattern = "(color-state|context|format|has-mipmap|height|id|sync|update-region|update-texture|width)"
     generate = [] # ignore get/set/notify
 
 [[object]]

gdk4/src/auto/gl_texture_builder.rs

@@ -7,15 +7,6 @@
 use crate::ColorState;
 use crate::{ffi, GLContext, MemoryFormat, Texture};
 use glib::translate::*;
-#[cfg(feature = "v4_16")]
-#[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
-use glib::{
-    prelude::*,
-    signal::{connect_raw, SignalHandlerId},
-};
-#[cfg(feature = "v4_16")]
-#[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
-use std::boxed::Box as Box_;
 
 glib::wrapper! {
     #[doc(alias = "GdkGLTextureBuilder")]
@@ -116,49 +107,6 @@ impl GLTextureBuilder {
     pub fn width(&self) -> i32 {
         unsafe { ffi::gdk_gl_texture_builder_get_width(self.to_glib_none().0) }
     }
-
-    #[cfg(feature = "v4_16")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
-    #[doc(alias = "gdk_gl_texture_builder_set_color_state")]
-    #[doc(alias = "color-state")]
-    pub fn set_color_state(&self, color_state: &ColorState) {
-        unsafe {
-            ffi::gdk_gl_texture_builder_set_color_state(
-                self.to_glib_none().0,
-                color_state.to_glib_none().0,
-            );
-        }
-    }
-
-    #[cfg(feature = "v4_16")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
-    #[doc(alias = "color-state")]
-    pub fn connect_color_state_notify<F: Fn(&Self) + Send + Sync + 'static>(
-        &self,
-        f: F,
-    ) -> SignalHandlerId {
-        unsafe extern "C" fn notify_color_state_trampoline<
-            F: Fn(&GLTextureBuilder) + Send + Sync + 'static,
-        >(
-            this: *mut ffi::GdkGLTextureBuilder,
-            _param_spec: glib::ffi::gpointer,
-            f: glib::ffi::gpointer,
-        ) {
-            let f: &F = &*(f as *const F);
-            f(&from_glib_borrow(this))
-        }
-        unsafe {
-            let f: Box_<F> = Box_::new(f);
-            connect_raw(
-                self.as_ptr() as *mut _,
-                c"notify::color-state".as_ptr() as *const _,
-                Some(std::mem::transmute::<*const (), unsafe extern "C" fn()>(
-                    notify_color_state_trampoline::<F> as *const (),
-                )),
-                Box_::into_raw(f),
-            )
-        }
-    }
 }
 
 #[cfg(feature = "v4_12")]

gdk4/src/gl_texture_builder.rs

@@ -2,6 +2,8 @@
 
 use glib::{prelude::*, translate::*};
 
+#[cfg(feature = "v4_16")]
+use crate::ColorState;
 use crate::{ffi, GLContext, GLTextureBuilder, MemoryFormat, Texture};
 
 #[cfg(not(feature = "gl"))]
@@ -43,6 +45,21 @@ impl GLTextureBuilder {
         ))
     }
 
+    #[cfg(feature = "v4_16")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "v4_16")))]
+    #[doc(alias = "gdk_gl_texture_builder_set_color_state")]
+    #[doc(alias = "color-state")]
+    pub fn set_color_state(self, color_state: &ColorState) -> Self {
+        unsafe {
+            ffi::gdk_gl_texture_builder_set_color_state(
+                self.to_glib_none().0,
+                color_state.to_glib_none().0,
+            );
+        }
+
+        self
+    }
+
     #[doc(alias = "gdk_gl_texture_builder_set_context")]
     pub fn set_context(self, context: Option<&impl IsA<GLContext>>) -> Self {
         unsafe {