Update gtk lib

mathieu-lemay · Oct 31, 2023 · b419065 · b419065
1 parent 3d8c1a8
commit b419065
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/f1-telemetry-display/Cargo.toml b/f1-telemetry-display/Cargo.toml
@@ -17,8 +17,8 @@ log = "^0.4"
 simplelog = "0.12.0"
 time = "0.3.11"
 ncurses = { version = "5.101", features = ["wide"] }
-gtk = "0.17.1"
-gio = "0.17.9"
-glib = "0.17.9"
-gdk = "0.17.1"
-cairo-rs = { version = "0.17.0", features = ["png"] }
+gtk = "0.18.1"
+gio = "0.18.2"
+glib = "0.18.2"
+gdk = "0.18.0"
+cairo-rs = { version = "0.18.2", features = ["png"] }
diff --git a/f1-telemetry-display/src/ui/gtk.rs b/f1-telemetry-display/src/ui/gtk.rs
@@ -5,6 +5,7 @@ use std::rc::Rc;
 
 use async_trait::async_trait;
 use gio::prelude::*;
+use glib::ControlFlow;
 use gtk::prelude::*;
 
 use f1_telemetry::packet::Packet;
@@ -73,7 +74,7 @@ impl Ui for GtkUi {
             let game_state = RefCell::new(GameState::default());
             let widgets = Rc::new(Widgets::new(app));
 
-            let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);
+            let (tx, rx) = glib::MainContext::channel(glib::Priority::DEFAULT);
 
             tokio::spawn(async move {
                 while let Some(p) = crate::CHANNEL.rx.write().await.recv().await {
@@ -84,7 +85,7 @@ impl Ui for GtkUi {
             rx.attach(None, move |packet| {
                 process_packet(&game_state, &widgets, &packet);
 
-                Continue(true)
+                ControlFlow::Continue
             });
         });