From 8bed71cfb5ab748e7017c7338c9ff6e67394a85f Mon Sep 17 00:00:00 2001
From: Jonathan Johnson <jon@khonsulabs.com>
Date: Sat, 21 Sep 2024 13:54:01 -0700
Subject: [PATCH] Adding xdg to ci

---
 .github/workflows/docs.yml | 4 ++--
 .github/workflows/rust.yml | 2 +-
 src/animation.rs           | 2 +-
 src/app.rs                 | 3 ++-
 src/window.rs              | 3 +--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 2691dda1e..c700e7b65 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -14,7 +14,7 @@ jobs:
           sudo add-apt-repository ppa:oibaf/graphics-drivers -y
           sudo apt-get update
           sudo apt-get install -y \
-            libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
+            libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers libdbus-1-dev pkg-config
 
       - uses: dtolnay/rust-toolchain@stable
 
@@ -46,7 +46,7 @@ jobs:
           sudo add-apt-repository ppa:oibaf/graphics-drivers -y
           sudo apt-get update
           sudo apt-get install -y \
-            libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
+            libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers libdbus-1-dev pkg-config
 
       - name: Download mdbook
         run: |
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2d7b134a6..61c3a11cf 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -32,7 +32,7 @@ jobs:
           # install dependencies
           sudo apt-get update
           sudo apt-get install -y \
-            libegl-mesa0 libgl1-mesa-dri libxcb-xfixes0-dev vulkan-sdk mesa-vulkan-drivers
+            libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers libdbus-1-dev pkg-config
 
       - uses: dtolnay/rust-toolchain@stable
         with:
diff --git a/src/animation.rs b/src/animation.rs
index 72b98fef6..135749fda 100644
--- a/src/animation.rs
+++ b/src/animation.rs
@@ -384,7 +384,7 @@ pub trait IntoAnimate: Sized + Send + Sync {
     /// Invokes `on_complete` after this animation finishes.
     fn on_complete<F>(self, on_complete: F) -> OnCompleteAnimation<Self>
     where
-        F: FnMut() + Send + Sync + 'static,
+        F: FnOnce() + Send + Sync + 'static,
     {
         OnCompleteAnimation::new(self, on_complete)
     }
diff --git a/src/app.rs b/src/app.rs
index bf3f7249c..655f4d2c2 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -8,10 +8,10 @@ use kludgine::app::winit::error::EventLoopError;
 use kludgine::app::{AppEvent, AsApplication, Monitors};
 use parking_lot::{Mutex, MutexGuard};
 
-use crate::animation;
 use crate::fonts::FontCollection;
 use crate::window::sealed::WindowCommand;
 use crate::window::WindowHandle;
+use crate::{animation, initialize_tracing};
 
 /// A Cushy application that has not started running yet.
 pub struct PendingApp {
@@ -73,6 +73,7 @@ impl Run for PendingApp {
 
 impl Default for PendingApp {
     fn default() -> Self {
+        initialize_tracing();
         Self::new(DefaultRuntime::default())
     }
 }
diff --git a/src/window.rs b/src/window.rs
index 874b8176f..1275f0c64 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -66,7 +66,7 @@ use crate::widget::{
 };
 use crate::widgets::shortcuts::{ShortcutKey, ShortcutMap};
 use crate::window::sealed::WindowCommand;
-use crate::{initialize_tracing, App, ConstraintLimit};
+use crate::{App, ConstraintLimit};
 
 /// A platform-dependent window implementation.
 pub trait PlatformWindowImplementation {
@@ -1102,7 +1102,6 @@ where
     Behavior: WindowBehavior,
 {
     fn run(self) -> crate::Result {
-        initialize_tracing();
         let mut app = PendingApp::default();
         self.open(&mut app)?;
         app.run()