window: update smithay-client-toolkit

wezterm · Jun 6, 2020 · 542fede · 542fede
1 parent afe72f3
commit 542fede
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/window/Cargo.toml b/window/Cargo.toml
@@ -58,7 +58,7 @@ xkbcommon = { version = "0.5", features = ["x11", "wayland"], git="https://githu
 mio = "0.6"
 mio-extras = "2.0"
 libc = "0.2"
-smithay-client-toolkit = {version = "0.9", optional = true, features=["calloop"], git="https://github.com/wez/client-toolkit.git", branch="title_tunc"}
+smithay-client-toolkit = {version = "0.9", optional = true, features=["calloop"], git="https://github.com/wez/client-toolkit.git", branch="title_trunc"}
 memmap = {version="0.7", optional=true}
 wayland-client = {version="0.26", optional=true}
 wayland-egl = {version="0.26", optional=true}

diff --git a/window/src/os/wayland/window.rs b/window/src/os/wayland/window.rs
@@ -197,7 +197,7 @@ impl WaylandWindow {
             .environment
             .borrow()
             .create_window::<ConceptFrame, _>(
-                surface.clone(),
+                surface.clone().detach(),
                 (
                     dimensions.pixel_width as u32,
                     dimensions.pixel_height as u32,
@@ -235,7 +235,7 @@ impl WaylandWindow {
             copy_and_paste,
             window_id,
             callbacks,
-            surface,
+            surface: surface.detach(),
             window: Some(window),
             pool,
             dimensions,