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

deps: update smithay/smithay-egui

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-02-04 20:53:18 +01:00
parent db6ca9e61c
commit 2d76672188
4 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Cargo.lock generated
View file

@ -683,9 +683,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.116" version = "0.2.117"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
[[package]] [[package]]
name = "libdbus-sys" name = "libdbus-sys"
@ -1209,6 +1209,7 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
[[package]] [[package]]
name = "smithay" name = "smithay"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/Smithay/smithay.git?rev=5da3a629#5da3a629290fef745abca58272cf27044acc03e6"
dependencies = [ dependencies = [
"appendlist", "appendlist",
"bitflags", "bitflags",
@ -1268,7 +1269,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=cdff1795#cdff17953e837fb090445db0ca8a85f6d932b79b" source = "git+https://github.com/Smithay/smithay-egui.git?rev=cdca17da#cdca17da3278751fa1fae9d3805c47012d7ca418"
dependencies = [ dependencies = [
"cgmath", "cgmath",
"egui", "egui",
@ -1383,9 +1384,9 @@ checksum = "4ccbe8381883510b6a2d8f1e32905bddd178c11caef8083086d0c0c9ab0ac281"
[[package]] [[package]]
name = "udev" name = "udev"
version = "0.6.2" version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3193363f52bb34c6708ac2ffedcb5f7e5874f0329ef68e1315f27d8d768eb568" checksum = "1c960764f7e816eed851a96c364745d37f9fe71a2e7dba79fbd40104530b5dd0"
dependencies = [ dependencies = [
"libc", "libc",
"libudev-sys", "libudev-sys",

9
Cargo.toml
View file

@ -21,18 +21,15 @@ xcursor = "0.3.3"
[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 = "ab89bda5" rev = "5da3a629"
default-features = false default-features = false
features = ["backend_drm", "backend_gbm", "backend_egl", "backend_libinput", "backend_session_logind", "backend_udev", "backend_winit", "backend_x11", "desktop", "use_system_lib", "renderer_gl", "wayland_frontend", "slog-stdlog"] features = ["backend_drm", "backend_gbm", "backend_egl", "backend_libinput", "backend_session_logind", "backend_udev", "backend_winit", "backend_x11", "desktop", "use_system_lib", "renderer_gl", "wayland_frontend", "slog-stdlog"]
[dependencies.smithay-egui] [dependencies.smithay-egui]
git = "https://github.com/Smithay/smithay-egui.git" git = "https://github.com/Smithay/smithay-egui.git"
rev = "cdff1795" rev = "cdca17da"
optional = true optional = true
[features] [features]
default = [] default = []
debug = ["egui", "smithay-egui"] debug = ["egui", "smithay-egui"]
[patch."https://github.com/Smithay/smithay"]
smithay = { path = "../../tavern/smithay" }

12
src/shell/grabs.rs
View file

@ -30,12 +30,15 @@ pub struct MoveSurfaceGrab {
impl PointerGrab for MoveSurfaceGrab { impl PointerGrab for MoveSurfaceGrab {
fn motion( fn motion(
&mut self, &mut self,
_handle: &mut PointerInnerHandle<'_>, handle: &mut PointerInnerHandle<'_>,
location: Point<f64, Logical>, location: Point<f64, Logical>,
_focus: Option<(wl_surface::WlSurface, Point<i32, Logical>)>, _focus: Option<(wl_surface::WlSurface, Point<i32, Logical>)>,
_serial: Serial, serial: Serial,
_time: u32, time: u32,
) { ) {
// While the grab is active, no client has pointer focus
handle.motion(location, None, serial, time);
let delta = location - self.start_data.location; let delta = location - self.start_data.location;
let new_location = self.initial_window_location.to_f64() + delta; let new_location = self.initial_window_location.to_f64() + delta;
self.window self.window
@ -175,6 +178,9 @@ impl PointerGrab for ResizeSurfaceGrab {
serial: Serial, serial: Serial,
time: u32, time: u32,
) { ) {
// While the grab is active, no client has pointer focus
handle.motion(location, None, serial, time);
// It is impossible to get `min_size` and `max_size` of dead toplevel, so we return early. // It is impossible to get `min_size` and `max_size` of dead toplevel, so we return early.
if !self.window.toplevel().alive() | self.window.toplevel().get_surface().is_none() { if !self.window.toplevel().alive() | self.window.toplevel().get_surface().is_none() {
handle.unset_grab(serial, time); handle.unset_grab(serial, time);

6
src/shell/mod.rs
View file

@ -150,7 +150,7 @@ pub fn init_shell(display: &mut Display) -> ShellStates {
initial_window_location, initial_window_location,
); );
pointer.set_grab(grab, serial); pointer.set_grab(grab, serial, 0);
} }
} }
@ -177,7 +177,7 @@ pub fn init_shell(display: &mut Display) -> ShellStates {
let grab = let grab =
grabs::ResizeSurfaceGrab::new(start_data, window, edges, geometry); grabs::ResizeSurfaceGrab::new(start_data, window, edges, geometry);
pointer.set_grab(grab, serial); pointer.set_grab(grab, serial, 0);
} }
} }
XdgRequest::AckConfigure { XdgRequest::AckConfigure {
@ -254,7 +254,7 @@ pub fn init_shell(display: &mut Display) -> ShellStates {
grab.ungrab(PopupUngrabStrategy::All); grab.ungrab(PopupUngrabStrategy::All);
return; return;
} }
pointer.set_grab(PopupPointerGrab::new(&grab), serial); pointer.set_grab(PopupPointerGrab::new(&grab), serial, 0);
} }
} }
} }