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

shell: Don't check grab-conditions for SSD grabs

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-07-03 23:40:42 +02:00
parent c42a2ac279
commit f02520c194
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/shell/mod.rs
View file

@ -2224,7 +2224,7 @@ impl Shell {
) -> Option<(MenuGrab, Focus)> { ) -> Option<(MenuGrab, Focus)> {
let serial = serial.into(); let serial = serial.into();
let Some(GrabStartData::Pointer(start_data)) = let Some(GrabStartData::Pointer(start_data)) =
check_grab_preconditions(&seat, surface, serial, ReleaseMode::NoMouseButtons) check_grab_preconditions(&seat, surface, serial, true)
else { else {
return None; return None;
}; };
@ -2331,7 +2331,12 @@ impl Shell {
) -> Option<(MoveGrab, Focus)> { ) -> Option<(MoveGrab, Focus)> {
let serial = serial.into(); let serial = serial.into();
let mut start_data = check_grab_preconditions(&seat, surface, serial, release)?; let mut start_data = check_grab_preconditions(
&seat,
surface,
serial,
release == ReleaseMode::NoMouseButtons && !move_out_of_stack,
)?;
let mut old_mapped = self.element_for_surface(surface).cloned()?; let mut old_mapped = self.element_for_surface(surface).cloned()?;
if old_mapped.is_minimized() { if old_mapped.is_minimized() {
return None; return None;
@ -2730,7 +2735,7 @@ impl Shell {
return None; return None;
} }
let mut start_data = check_grab_preconditions(&seat, &surface, None, ReleaseMode::Click)?; let mut start_data = check_grab_preconditions(&seat, &surface, None, false)?;
let (floating_layer, geometry) = if let Some(set) = self let (floating_layer, geometry) = if let Some(set) = self
.workspaces .workspaces
@ -2958,8 +2963,7 @@ impl Shell {
edges: ResizeEdge, edges: ResizeEdge,
) -> Option<(ResizeGrab, Focus)> { ) -> Option<(ResizeGrab, Focus)> {
let serial = serial.into(); let serial = serial.into();
let start_data = let start_data = check_grab_preconditions(&seat, surface, serial, true)?;
check_grab_preconditions(&seat, surface, serial, ReleaseMode::NoMouseButtons)?;
let mapped = self.element_for_surface(surface).cloned()?; let mapped = self.element_for_surface(surface).cloned()?;
if mapped.is_fullscreen(true) || mapped.is_maximized(true) { if mapped.is_fullscreen(true) || mapped.is_maximized(true) {
return None; return None;
@ -3294,7 +3298,7 @@ pub fn check_grab_preconditions(
seat: &Seat<State>, seat: &Seat<State>,
surface: &WlSurface, surface: &WlSurface,
serial: Option<Serial>, serial: Option<Serial>,
release: ReleaseMode, client_initiated: bool,
) -> Option<GrabStartData> { ) -> Option<GrabStartData> {
use smithay::reexports::wayland_server::Resource; use smithay::reexports::wayland_server::Resource;
@ -3314,7 +3318,7 @@ pub fn check_grab_preconditions(
})) }))
}; };
if release == ReleaseMode::NoMouseButtons { if client_initiated {
// Check that this surface has a click or touch down grab. // Check that this surface has a click or touch down grab.
if !match serial { if !match serial {
Some(serial) => pointer.has_grab(serial) || touch.has_grab(serial), Some(serial) => pointer.has_grab(serial) || touch.has_grab(serial),