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

shell: Allow overview to be triggered by pointer

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-07-17 21:11:45 +02:00
parent a8a5ee466a
commit f00dda7591
2 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/input/mod.rs
View file

@ -8,7 +8,7 @@ use crate::{
layout::{
tiling::{Direction, FocusResult, MoveResult},
},
OverviewMode, ResizeDirection, ResizeMode, Workspace,
OverviewMode, ResizeDirection, ResizeMode, Workspace, Trigger,
}, // shell::grabs::SeatMoveGrabState
state::Common,
utils::prelude::*,
@ -251,7 +251,7 @@ impl State {
time,
|data, modifiers, handle| {
// Leave overview mode, if any modifier was released
if let OverviewMode::Started(action_modifiers, _) =
if let OverviewMode::Started(Trigger::Keyboard(action_modifiers), _) =
data.common.shell.overview_mode()
{
if (action_modifiers.ctrl && !modifiers.ctrl)
@ -687,6 +687,14 @@ impl State {
}
Common::set_focus(self, under.and_then(|target| target.try_into().ok()).as_ref(), seat, Some(serial));
}
} else {
if let OverviewMode::Started(Trigger::Pointer(action_button), _) =
self.common.shell.overview_mode()
{
if action_button == button {
self.common.shell.set_overview_mode(None);
}
}
};
seat.get_pointer().unwrap().button(
self,
@ -1214,7 +1222,7 @@ impl State {
MoveResult::Done => {
if let Some(focused_window) = workspace.focus_stack.get(seat).last() {
if workspace.is_tiled(focused_window) {
self.common.shell.set_overview_mode(Some(pattern.modifiers));
self.common.shell.set_overview_mode(Some(Trigger::Keyboard(pattern.modifiers)));
}
}
}