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

view: replace mode with float/fullscreen bools

Browse Source 
The enum would be awkward here since if a view is fullscreened while
floating it should still be floating when defullscreened.
This commit is contained in:
Isaac Freund
2020-06-28 20:30:12 +02:00
parent 60f06a1a40
commit 5b96d831d3
6 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
river/command/toggle_float.zig
View File

@ -29,14 +29,13 @@ pub fn toggleFloat(
out: *?[]const u8,
) Error!void {
if (args.len > 1) return Error.TooManyArguments;
if (seat.focused_view) |view| {
switch (view.current.mode) {
.layout => {
view.pending.mode = .float;
view.pending.box = view.getDefaultFloatBox();
},
.float => view.pending.mode = .layout,
}
// Don't float fullscreen views
if (view.pending.fullscreen) return;
if (!view.pending.float) view.pending.box = view.getDefaultFloatBox();
view.pending.float = !view.pending.float;
view.output.root.arrange();
}
}

18
river/command/zoom.zig
View File

@ -37,13 +37,21 @@ pub fn zoom(
const focused_node = @fieldParentPtr(ViewStack(View).Node, "view", current_focus);
// Only zoom views that are part of the layout
if (current_focus.current.mode != .layout) return;
if (current_focus.pending.float or current_focus.pending.fullscreen) return;
// If the the first view that is part of the layout is focused, zoom
// the next view in the layout. Otherwise zoom the focused view.
var it = ViewStack(View).iterator(output.views.first, output.current_focused_tags);
const zoom_node = if (focused_node == it.next())
if (it.next()) |second| second else null
else
focused_node;
const layout_first = while (it.next()) |node| {
if (!node.view.pending.float and !node.view.pending.fullscreen) break node;
} else unreachable;
const zoom_node = if (focused_node == layout_first) blk: {
while (it.next()) |node| {
if (!node.view.pending.float and !node.view.pending.fullscreen) break :blk node;
} else {
break :blk null;
}
} else focused_node;
if (zoom_node) |to_bump| {
output.views.remove(to_bump);