Merge pull request #1 from paper-plane-developers/yuraiz/bump-deps

chore: Update dependencies: gtk to 0.7 and adw to 0.5
paper-plane-developers · Sep 30, 2023 · 1fe648f · 1fe648f
2 parents 69010b6 + d179b7c
commit 1fe648f
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 149 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/demo/Cargo.toml b/demo/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-adw = { version = "0.4.1", package = "libadwaita" }
-gtk = { version = "0.6.6", package = "gtk4", features = ["v4_10", "blueprint"] }
+adw = { version = "0.5", package = "libadwaita" }
+gtk = { version = "0.7", package = "gtk4", features = ["v4_10", "blueprint"] }
 ori = { path = "../origami", package = "origami" }
diff --git a/demo/src/window/loading_indicator/loading_indicator.blp b/demo/src/window/loading_indicator/loading_indicator.blp
@@ -18,23 +18,23 @@ template $OriDemoLoadingIndicatorPage : Adw.Bin {
                 $OriLoadingIndicator {
                     valign: center;
 
-                    progress: bind-property progress_adjustment.value;
+                    progress: bind progress_adjustment.value;
                 }
 
                 $OriLoadingIndicator {
                     valign: center;
                     height-request: 48;
                         width-request: 48;
 
-                        progress: bind-property progress_adjustment.value;
+                        progress: bind progress_adjustment.value;
                     }
 
                     $OriLoadingIndicator {
                         valign: center;
                         height-request: 64;
                         width-request: 64;
 
-                        progress: bind-property progress_adjustment.value;
+                        progress: bind progress_adjustment.value;
                     }
                 }
 

diff --git a/demo/src/window/mod.rs b/demo/src/window/mod.rs
@@ -36,20 +36,19 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for SpoilerWindow {
-        fn constructed(&self) {
-            self.parent_constructed();
-
-            self.obj().connect_close_request(|window| {
-                window.application().unwrap().quit();
-                gtk::Inhibit(true)
-            });
+    impl ObjectImpl for SpoilerWindow {}
+
+    impl WidgetImpl for SpoilerWindow {}
+
+    impl WindowImpl for SpoilerWindow {
+        fn close_request(&self) -> glib::Propagation {
+            self.obj().application().unwrap().quit();
+            self.parent_close_request()
         }
     }
 
-    impl WidgetImpl for SpoilerWindow {}
-    impl WindowImpl for SpoilerWindow {}
     impl ApplicationWindowImpl for SpoilerWindow {}
+
     impl AdwApplicationWindowImpl for SpoilerWindow {}
 }
 

diff --git a/demo/src/window/spoiler/spoiler.blp b/demo/src/window/spoiler/spoiler.blp
@@ -32,7 +32,7 @@ template $OriDemoSpoilerPage : Adw.Bin {
                     vexpand: true;
 
                     // the most important property
-                    hidden: bind-property revealer.reveal-child inverted bidirectional;
+                    hidden: bind revealer.reveal-child inverted bidirectional;
 
                     child:  Adw.StatusPage {
                         title: "Drop any pictures here";

diff --git a/origami/Cargo.toml b/origami/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-adw = { version = "0.4.1", package = "libadwaita" }
-gtk = { version = "0.6.6", package = "gtk4", features = ["v4_10"] }
+adw = { version = "0.5", package = "libadwaita" }
+gtk = { version = "0.7", package = "gtk4", features = ["v4_10"] }
 log = "0.4.17"
diff --git a/origami/src/loading_indicator/mod.rs b/origami/src/loading_indicator/mod.rs
@@ -34,7 +34,7 @@ mod imp {
                     widget.imp().start_time.set(widget.time());
                     widget.add_tick_callback(|widget, _clock| {
                         widget.queue_draw();
-                        Continue(widget.is_visible())
+                        glib::ControlFlow::from(widget.is_visible())
                     });
                 }
             });

diff --git a/origami/src/shimmer_effect/mod.rs b/origami/src/shimmer_effect/mod.rs
@@ -53,7 +53,7 @@ mod imp {
                 if widget.playing() {
                     widget.add_tick_callback(|widget, _clock| {
                         widget.queue_draw();
-                        Continue(widget.playing())
+                        glib::ControlFlow::from(widget.playing())
                     });
                 }
             });

diff --git a/origami/src/spoiler_overlay/mod.rs b/origami/src/spoiler_overlay/mod.rs
@@ -69,7 +69,7 @@ mod imp {
                     widget.imp().start_time.set(widget.time());
                     widget.add_tick_callback(|widget, _clock| {
                         widget.queue_draw();
-                        Continue(widget.hidden())
+                        glib::ControlFlow::from(widget.hidden())
                     });
                 }
             });