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

Fix layout bugs

Browse Source 
This fixes two bugs: First, the height of the slave stack was to high
when using the TopMaster or BottomMaster layouts with no views in the
master stack. Second, the view padding was not respected when using the
Full layout.
This commit is contained in:
Leon Henrik Plickat 2020-05-22 03:26:51 +02:00 committed by Isaac Freund
parent b02110af18
commit 2575f642f1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Output.zig
View File

@ -231,7 +231,7 @@ pub fn layoutMasterStack(self: *Self, visible_count: u32, output_tags: u32, posi
if (position == MasterPosition.Right or position == MasterPosition.Left) { if (position == MasterPosition.Right or position == MasterPosition.Left) {
slave_stack_size = layout_width; slave_stack_size = layout_width;
} else { } else {
slave_stack_size = layout_width; slave_stack_size = layout_height;
} }
master_stack_size = 0; master_stack_size = 0;
} }
@ -367,13 +367,14 @@ pub fn layoutLeftMaster(self: *Self, visible_count: u32, output_tags: u32) void
/// A layout in which every window uses the maximum available space. /// A layout in which every window uses the maximum available space.
pub fn layoutFull(self: *Self, visible_count: u32, output_tags: u32) void { pub fn layoutFull(self: *Self, visible_count: u32, output_tags: u32) void {
const border_width = self.root.server.config.border_width; const border_width = self.root.server.config.border_width;
const view_padding = self.root.server.config.view_padding;
const outer_padding = self.root.server.config.outer_padding; const outer_padding = self.root.server.config.outer_padding;
const layout_width = @intCast(u32, self.usable_box.width) - const layout_width = @intCast(u32, self.usable_box.width) -
(outer_padding * 2) - (border_width * 2); (outer_padding * 2) - (border_width * 2) - (view_padding * 2);
const layout_height = @intCast(u32, self.usable_box.height) - const layout_height = @intCast(u32, self.usable_box.height) -
(outer_padding * 2) - (border_width * 2); (outer_padding * 2) - (border_width * 2) - (view_padding * 2);
const xy_offset = @intCast(i32, outer_padding + border_width); const xy_offset = @intCast(i32, outer_padding + border_width + view_padding);
var i: u32 = 0; var i: u32 = 0;
var it = ViewStack(View).pendingIterator(self.views.first, output_tags); var it = ViewStack(View).pendingIterator(self.views.first, output_tags);