From db3e372b8f81f174513b4a9f82a876d267d0145c Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Thu, 21 Sep 2023 18:21:20 +0200
Subject: [PATCH] chore: Update smithay/smithay-egui

---
 Cargo.lock   | 5 +++--
 Cargo.toml   | 6 +++---
 src/debug.rs | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1094454a..0b53ed32 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3761,7 +3761,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 [[package]]
 name = "smithay"
 version = "0.3.0"
-source = "git+https://github.com/smithay//smithay?rev=5affbde525#5affbde5256ada864d98804933959e1dcb2129e0"
+source = "git+https://github.com/smithay//smithay?rev=58d5bdc#58d5bdca0d65b5f45408201770da0ce86b1fa057"
 dependencies = [
  "appendlist",
  "ash",
@@ -3790,6 +3790,7 @@ dependencies = [
  "rand",
  "scan_fmt",
  "scopeguard",
+ "smallvec",
  "tempfile",
  "thiserror",
  "tracing",
@@ -3828,7 +3829,7 @@ dependencies = [
 [[package]]
 name = "smithay-egui"
 version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay-egui.git?rev=0a4d573#0a4d57349ad4c9bedb25968b22b7bcb7756dd8cc"
+source = "git+https://github.com/Smithay/smithay-egui.git?rev=dab5c1b#dab5c1b4323e35389500996a8119906b54f63fda"
 dependencies = [
  "cgmath",
  "egui",
diff --git a/Cargo.toml b/Cargo.toml
index 2375d254..6b6c5d8e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,13 +61,13 @@ branch = "feature/copy_clone"
 [dependencies.smithay]
 version = "0.3"
 git = "https://github.com/smithay/smithay.git"
-rev = "138921bff4"
+rev = "58d5bdc"
 default-features = false
 features = ["backend_drm", "backend_gbm", "backend_egl", "backend_libinput", "backend_session_libseat", "backend_udev", "backend_winit", "backend_vulkan", "backend_x11", "desktop", "use_system_lib", "renderer_glow", "renderer_multi", "wayland_frontend", "xwayland"]
 
 [dependencies.smithay-egui]
 git = "https://github.com/Smithay/smithay-egui.git"
-rev = "0a4d573"
+rev = "dab5c1b"
 features = ["svg"]
 optional = true
 
@@ -87,4 +87,4 @@ debug = true
 lto = "fat"
 
 [patch."https://github.com/Smithay/smithay.git"]
-smithay = { git = "https://github.com/smithay//smithay", rev = "5affbde525" }
+smithay = { git = "https://github.com/smithay//smithay", rev = "58d5bdc" }
diff --git a/src/debug.rs b/src/debug.rs
index 04564dda..8f222689 100644
--- a/src/debug.rs
+++ b/src/debug.rs
@@ -327,12 +327,12 @@ fn format_pointer_focus(focus: Option<PointerFocusTarget>) -> String {
         },
         Some(Fullscreen(x)) => format!(
             "Fullscreen {} ({})",
-            match &x {
+            match x.surface() {
                 CosmicSurface::Wayland(w) => w.toplevel().wl_surface().id().protocol_id(),
                 CosmicSurface::X11(x) => x.window_id(),
                 _ => unreachable!(),
             },
-            x.title()
+            x.surface().title()
         ),
         Some(LayerSurface(x)) => format!("LayerSurface {}", x.wl_surface().id().protocol_id()),
         Some(Popup(x)) => format!("Popup {}", x.wl_surface().id().protocol_id()),
@@ -369,12 +369,12 @@ fn format_keyboard_focus(focus: Option<KeyboardFocusTarget>) -> String {
         },
         Some(Fullscreen(x)) => format!(
             "Fullscreen {} ({})",
-            match &x {
+            match x.surface() {
                 CosmicSurface::Wayland(w) => w.toplevel().wl_surface().id().protocol_id(),
                 CosmicSurface::X11(x) => x.window_id(),
                 _ => unreachable!(),
             },
-            x.title()
+            x.surface().title()
         ),
         Some(LayerSurface(x)) => format!("LayerSurface {}", x.wl_surface().id().protocol_id()),
         Some(Popup(x)) => format!("Popup {}", x.wl_surface().id().protocol_id()),