Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

view: forbid mode change if cursor target

Browse Source 
Making a floating view tiled during a resize breaks things badly.
This commit is contained in:
Isaac Freund
2020-07-29 16:54:46 +02:00
parent 9f3ee76e51
commit d87356c93a
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
river/command/toggle_float.zig
View File

@ -36,6 +36,9 @@ pub fn toggleFloat(
// Don't float fullscreen views
if (view.pending.fullscreen) return;
// Don't modify views which are the target of a cursor action
if (seat.input_manager.isCursorActionTarget(view)) return;
if (!view.pending.float) view.pending.box = view.float_box;
view.pending.float = !view.pending.float;
view.output.root.arrange();

9
river/command/toggle_fullscreen.zig
View File

@ -30,7 +30,12 @@ pub fn toggleFullscreen(
if (args.len > 1) return Error.TooManyArguments;
if (seat.focused == .view) {
seat.focused.view.setFullscreen(!seat.focused.view.pending.fullscreen);
seat.focused.view.output.root.arrange();
const view = seat.focused.view;
// Don't modify views which are the target of a cursor action
if (seat.input_manager.isCursorActionTarget(view)) return;
view.setFullscreen(!seat.focused.view.pending.fullscreen);
view.output.root.arrange();
}
}