From 4ca7c7153871f8bc2b440fee2dda97a3512bd990 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Wed, 29 Nov 2023 19:19:49 +0100
Subject: [PATCH] imagePage: Use properties macro

---
 src/widgets/image_page.rs | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/widgets/image_page.rs b/src/widgets/image_page.rs
index d01e5cb..560d41e 100644
--- a/src/widgets/image_page.rs
+++ b/src/widgets/image_page.rs
@@ -25,14 +25,15 @@ use crate::widgets::LpImage;
 
 use adw::subclass::prelude::*;
 use glib::clone;
+use glib::Properties;
 use gtk::prelude::*;
 use gtk::CompositeTemplate;
-use once_cell::sync::Lazy;
 
 mod imp {
     use super::*;
 
-    #[derive(Debug, Default, CompositeTemplate)]
+    #[derive(Debug, Default, CompositeTemplate, Properties)]
+    #[properties(wrapper_type = super::LpImagePage)]
     #[template(file = "image_page.ui")]
     pub struct LpImagePage {
         #[template_child]
@@ -48,6 +49,7 @@ mod imp {
         #[template_child]
         pub(super) scrolled_window: TemplateChild<gtk::ScrolledWindow>,
         #[template_child]
+        #[property(type = LpImage, get = Self::image)]
         pub(super) image: TemplateChild<LpImage>,
         #[template_child]
         pub(super) popover: TemplateChild<gtk::PopoverMenu>,
@@ -74,21 +76,11 @@ mod imp {
 
     impl ObjectImpl for LpImagePage {
         fn properties() -> &'static [glib::ParamSpec] {
-            static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
-                vec![glib::ParamSpecObject::builder::<LpImage>("image")
-                    .read_only()
-                    .build()]
-            });
-
-            PROPERTIES.as_ref()
+            Self::derived_properties()
         }
 
-        fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
-            let obj = self.obj();
-            match pspec.name() {
-                "image" => obj.image().to_value(),
-                name => unimplemented!("property {name}"),
-            }
+        fn property(&self, id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+            self.derived_property(id, pspec)
         }
 
         fn constructed(&self) {
@@ -143,6 +135,12 @@ mod imp {
 
     impl WidgetImpl for LpImagePage {}
     impl BinImpl for LpImagePage {}
+
+    impl LpImagePage {
+        pub fn image(&self) -> LpImage {
+            self.image.get()
+        }
+    }
 }
 
 glib::wrapper! {
@@ -173,10 +171,6 @@ impl LpImagePage {
         self.imp().scrolled_window.clone()
     }
 
-    pub fn image(&self) -> LpImage {
-        self.imp().image.get()
-    }
-
     pub fn content_provider(&self) -> Option<gdk::ContentProvider> {
         self.imp().image.content_provider()
     }