leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Update smithay/smithay-egui

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-09-21 18:21:20 +02:00
parent ef361ae932
commit db3e372b8f
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Cargo.lock generated
View file

@ -3761,7 +3761,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.3.0" 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 = [ dependencies = [
"appendlist", "appendlist",
"ash", "ash",
@ -3790,6 +3790,7 @@ dependencies = [
"rand", "rand",
"scan_fmt", "scan_fmt",
"scopeguard", "scopeguard",
"smallvec",
"tempfile", "tempfile",
"thiserror", "thiserror",
"tracing", "tracing",
@ -3828,7 +3829,7 @@ dependencies = [
[[package]] [[package]]
name = "smithay-egui" name = "smithay-egui"
version = "0.1.0" 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 = [ dependencies = [
"cgmath", "cgmath",
"egui", "egui",

6
Cargo.toml
View file

@ -61,13 +61,13 @@ branch = "feature/copy_clone"
[dependencies.smithay] [dependencies.smithay]
version = "0.3" version = "0.3"
git = "https://github.com/smithay/smithay.git" git = "https://github.com/smithay/smithay.git"
rev = "138921bff4" rev = "58d5bdc"
default-features = false 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"] 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] [dependencies.smithay-egui]
git = "https://github.com/Smithay/smithay-egui.git" git = "https://github.com/Smithay/smithay-egui.git"
rev = "0a4d573" rev = "dab5c1b"
features = ["svg"] features = ["svg"]
optional = true optional = true
@ -87,4 +87,4 @@ debug = true
lto = "fat" lto = "fat"
[patch."https://github.com/Smithay/smithay.git"] [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" }

8
src/debug.rs
View file

@ -327,12 +327,12 @@ fn format_pointer_focus(focus: Option<PointerFocusTarget>) -> String {
}, },
Some(Fullscreen(x)) => format!( Some(Fullscreen(x)) => format!(
"Fullscreen {} ({})", "Fullscreen {} ({})",
match &x { match x.surface() {
CosmicSurface::Wayland(w) => w.toplevel().wl_surface().id().protocol_id(), CosmicSurface::Wayland(w) => w.toplevel().wl_surface().id().protocol_id(),
CosmicSurface::X11(x) => x.window_id(), CosmicSurface::X11(x) => x.window_id(),
_ => unreachable!(), _ => unreachable!(),
}, },
x.title() x.surface().title()
), ),
Some(LayerSurface(x)) => format!("LayerSurface {}", x.wl_surface().id().protocol_id()), Some(LayerSurface(x)) => format!("LayerSurface {}", x.wl_surface().id().protocol_id()),
Some(Popup(x)) => format!("Popup {}", 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!( Some(Fullscreen(x)) => format!(
"Fullscreen {} ({})", "Fullscreen {} ({})",
match &x { match x.surface() {
CosmicSurface::Wayland(w) => w.toplevel().wl_surface().id().protocol_id(), CosmicSurface::Wayland(w) => w.toplevel().wl_surface().id().protocol_id(),
CosmicSurface::X11(x) => x.window_id(), CosmicSurface::X11(x) => x.window_id(),
_ => unreachable!(), _ => unreachable!(),
}, },
x.title() x.surface().title()
), ),
Some(LayerSurface(x)) => format!("LayerSurface {}", x.wl_surface().id().protocol_id()), Some(LayerSurface(x)) => format!("LayerSurface {}", x.wl_surface().id().protocol_id()),
Some(Popup(x)) => format!("Popup {}", x.wl_surface().id().protocol_id()), Some(Popup(x)) => format!("Popup {}", x.wl_surface().id().protocol_id()),