From 1452b1a0e0a46adbd001434703b0a5e1d0e72edb Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Wed, 19 Jun 2024 13:04:35 +1200 Subject: [PATCH] Test fixes --- .github/workflows/ci.yml | 6 +++--- packages/dioxus-blitz/src/window.rs | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 392b0f00..e5196cb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: 1.79 - - run: sudo apt install libgtk-3-dev + - run: sudo apt install libgtk-3-dev libxdo-dev - run: cargo build --workspace test-features-default: @@ -35,7 +35,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - - run: sudo apt install libgtk-3-dev + - run: sudo apt install libgtk-3-dev libxdo-dev - run: cargo build --workspace - run: cargo test --workspace @@ -59,7 +59,7 @@ jobs: with: toolchain: nightly components: clippy - - run: sudo apt install libgtk-3-dev + - run: sudo apt install libgtk-3-dev libxdo-dev - run: cargo clippy --workspace -- -D warnings doc: diff --git a/packages/dioxus-blitz/src/window.rs b/packages/dioxus-blitz/src/window.rs index 5fb5c626..920b5580 100644 --- a/packages/dioxus-blitz/src/window.rs +++ b/packages/dioxus-blitz/src/window.rs @@ -296,7 +296,9 @@ impl<'a, Doc: DocumentLike> View<'a, Doc> { } #[cfg(target_os = "linux")] { - build_menu().init_for_gtk_window(window.gtk_window(), window.default_vbox()); + build_menu() + .init_for_gtk_window(window.gtk_window(), window.default_vbox()) + .unwrap(); } // !TODO - this may not be the right way to do this, but it's a start @@ -331,10 +333,10 @@ impl<'a, Doc: DocumentLike> View<'a, Doc> { #[cfg(not(target_os = "macos"))] fn build_menu() -> Menu { - let mut menu = Menu::new(); + let menu = Menu::new(); // Build the about section - let mut about = Submenu::new("About", true); + let about = Submenu::new("About", true); about .append_items(&[