From 91863adcf1ece7c73b8ca451433c67add70a058a Mon Sep 17 00:00:00 2001 From: Victoria Brekenfeld Date: Wed, 30 Mar 2022 23:54:00 +0200 Subject: [PATCH] deps: Use smithay fork again --- Cargo.lock | 14 +++++++------- Cargo.toml | 4 ++-- src/backend/render/cursor.rs | 7 ++++++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a69c53b..2d623265 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -653,9 +653,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", "hashbrown", @@ -1127,9 +1127,9 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7" +checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" dependencies = [ "cty", ] @@ -1303,7 +1303,7 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git?rev=bff3f51c#bff3f51cda0789ae4d5585b2ff2eb568b66c8f16" +source = "git+https://github.com/pop-os/smithay?branch=main#f5b3b7265518f91e24161b187c615dc5f1cd6a43" dependencies = [ "appendlist", "bitflags", @@ -1387,9 +1387,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index ff656cf2..c89fe9b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,5 +54,5 @@ debug = true [profile.release] lto = "fat" -#[patch."https://github.com/Smithay/smithay.git"] -#smithay = { git = "https://github.com/pop-os/smithay", branch = "main" } \ No newline at end of file +[patch."https://github.com/Smithay/smithay.git"] +smithay = { git = "https://github.com/pop-os/smithay", branch = "main" } \ No newline at end of file diff --git a/src/backend/render/cursor.rs b/src/backend/render/cursor.rs index ba3eeadf..138fc309 100644 --- a/src/backend/render/cursor.rs +++ b/src/backend/render/cursor.rs @@ -146,7 +146,11 @@ where (0, 0).into() } }; - SurfaceTree { surface, position } + SurfaceTree { + surface, + position, + z_index: 100, + } } pub fn draw_dnd_icon( @@ -161,6 +165,7 @@ pub fn draw_dnd_icon( SurfaceTree { surface, position: location.into(), + z_index: 100, } }