refactor: ⬆️ Upgrade egui and other deps

Author: zmerp

Cargo.lock

@@ -17,7 +17,7 @@ serde = "1"
 
 [target.'cfg(windows)'.dependencies]
 widestring = "1"
-windows = { version = "0.51", features = [
+windows = { version = "0.52", features = [
     "Win32_Devices_FunctionDiscovery",
     "Win32_Foundation",
     "Win32_Media_Audio_Endpoints",

alvr/audio/Cargo.toml

@@ -12,6 +12,6 @@ alvr_client_core.workspace = true
 alvr_packets.workspace = true
 alvr_session.workspace = true
 
-eframe = "0.23"
+eframe = "0.24"
 env_logger = "0.10"
 rand = "0.8"

alvr/client_mock/Cargo.toml

@@ -7,7 +7,7 @@ use alvr_common::{
 use alvr_packets::Tracking;
 use alvr_session::CodecType;
 use eframe::{
-    egui::{self, CentralPanel, Context, RichText, Slider},
+    egui::{CentralPanel, Context, RichText, Slider, ViewportBuilder},
     Frame, NativeOptions,
 };
 use std::{
@@ -308,7 +308,7 @@ fn main() {
     eframe::run_native(
         "Mock client",
         NativeOptions {
-            initial_window_size: Some(egui::vec2(400.0, 400.0)),
+            viewport: ViewportBuilder::default().with_inner_size((400.0, 400.0)),
             ..Default::default()
         },
         Box::new(|_| Box::new(Window::new(input_sender, output_receiver))),

alvr/client_mock/src/main.rs

@@ -16,7 +16,7 @@ alvr_gui_common.workspace = true
 
 bincode = "1"
 chrono = "0.4"
-eframe = "0.23"
+eframe = "0.24"
 env_logger = "0.10"
 ico = "0.3"
 rand = "0.8"

alvr/dashboard/Cargo.toml

@@ -336,22 +336,23 @@ impl eframe::App for Dashboard {
         for request in requests {
             self.data_sources.request(request);
         }
-    }
 
-    #[cfg(not(target_arch = "wasm32"))]
-    fn on_close_event(&mut self) -> bool {
-        if crate::data_sources::get_local_data_source()
-            .settings()
-            .steamvr_launcher
-            .open_close_steamvr_with_dashboard
+        if context.input(|state| state.viewport().close_requested())
+            && self
+                .session
+                .as_ref()
+                .map(|s| {
+                    s.to_settings()
+                        .steamvr_launcher
+                        .open_close_steamvr_with_dashboard
+                })
+                .unwrap_or(false)
         {
             self.data_sources.request(ServerRequest::ShutdownSteamvr);
 
             crate::steamvr_launcher::LAUNCHER
                 .lock()
                 .ensure_steamvr_shutdown()
         }
-
-        true
     }
 }

alvr/dashboard/src/dashboard/mod.rs

@@ -22,7 +22,10 @@ use dashboard::Dashboard;
 #[cfg(not(target_arch = "wasm32"))]
 fn main() {
     use alvr_common::ALVR_VERSION;
-    use eframe::{egui, IconData, NativeOptions};
+    use eframe::{
+        egui::{IconData, ViewportBuilder},
+        NativeOptions,
+    };
     use ico::IconDir;
     use std::{env, fs};
     use std::{io::Cursor, sync::mpsc};
@@ -85,12 +88,13 @@ fn main() {
     eframe::run_native(
         &format!("ALVR Dashboard (streamer v{})", *ALVR_VERSION),
         NativeOptions {
-            icon_data: Some(IconData {
-                rgba: image.rgba_data().to_owned(),
-                width: image.width(),
-                height: image.height(),
-            }),
-            initial_window_size: Some(egui::vec2(870.0, 600.0)),
+            viewport: ViewportBuilder::default()
+                .with_inner_size((870.0, 600.0))
+                .with_icon(IconData {
+                    rgba: image.rgba_data().to_owned(),
+                    width: image.width(),
+                    height: image.height(),
+                }),
             centered: true,
             ..Default::default()
         },

alvr/dashboard/src/main.rs

@@ -9,4 +9,4 @@ license.workspace = true
 [dependencies]
 alvr_common.workspace = true
 
-egui = "0.23"
+egui = "0.24"

alvr/gui_common/Cargo.toml

@@ -10,7 +10,7 @@ alvr_common.workspace = true
 alvr_gui_common.workspace = true
 
 anyhow = "1"
-eframe = "0.23"
+eframe = "0.24"
 futures-util = "0.3.28"
 open = "5"
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream", "json"] }

alvr/launcher/Cargo.toml

@@ -13,7 +13,10 @@ use std::{
 };
 
 use eframe::{
-    egui::{Button, CentralPanel, ComboBox, Context, Frame, Grid, Layout, ProgressBar, Window},
+    egui::{
+        Button, CentralPanel, ComboBox, Context, Frame, Grid, Layout, ProgressBar, ViewportCommand,
+        Window,
+    },
     emath::{Align, Align2},
     epaint::Color32,
 };
@@ -423,7 +426,7 @@ impl Launcher {
 }
 
 impl eframe::App for Launcher {
-    fn update(&mut self, ctx: &Context, frame: &mut eframe::Frame) {
+    fn update(&mut self, ctx: &Context, _: &mut eframe::Frame) {
         while let Ok(msg) = self.rx.try_recv() {
             match msg {
                 WorkerMsg::VersionData(data) => self.version_data = Some(data),
@@ -470,7 +473,7 @@ impl eframe::App for Launcher {
                                                     }
                                                 }
                                                 self.tx.send(GuiMsg::Quit).unwrap();
-                                                frame.close();
+                                                ctx.send_viewport_cmd(ViewportCommand::Close);
                                             }
                                             if ui
                                                 .add_enabled(
@@ -548,11 +551,10 @@ impl eframe::App for Launcher {
                 });
             }
         });
-    }
 
-    fn on_close_event(&mut self) -> bool {
-        self.tx.send(GuiMsg::Quit).unwrap();
-        true
+        if ctx.input(|i| i.viewport().close_requested()) {
+            self.tx.send(GuiMsg::Quit).unwrap();
+        }
     }
 }
 
@@ -756,7 +758,7 @@ async fn install(
 
     let buffer = download(tx, "Downloading Streamer", &url, client).await?;
 
-    let mut installation_dir = data_dir().extended(VERSIONS_SUBDIR).extended(&release.tag);
+    let installation_dir = data_dir().extended(VERSIONS_SUBDIR).extended(&release.tag);
 
     fs::create_dir_all(&installation_dir)?;