Merge the macOS first-class-host work

1 files changed, 4 insertions, 4 deletions

diff --git a/src/layout.zig b/src/layout.zig
index 47b2c1a4..c6cb7503 100644
--- a/src/layout.zig
+++ b/src/layout.zig
@@ -8,7 +8,7 @@ pub const Rect = struct { x: u16 = 0, y: u16 = 0, w: u16 = 0, h: u16 = 0 };
 pub const Snapshot = struct { serial: u32, box: Box };
 const MAX_COLS = pardes.MAX_COLS;
 const MAX_PANES = pardes.MAX_PANES;
-const TOPBAR_H = pardes.TOPBAR_H;
+
 const BOX_H = pardes.BOX_H;
 
 pub const Presentation = struct {
@@ -795,7 +795,7 @@ pub fn movePlacement(p: *Pardes, id: usize, cur_x: u16, cur_y: u16) ?MovePlaceme
         const sib = if (src.idx > 0) p.col_panes[src.col][src.idx - 1] else p.col_panes[src.col][src.idx + 1];
         heights[sib] +|= p.rects[id].h;
     }
-    var y: u16 = TOPBAR_H + p.columnBarHeight();
+    var y: u16 = p.topBarHeight() + p.columnBarHeight();
     var last: ?MovePlacement = null;
     for (0..p.col_n[tc]) |k| {
         const pid = p.col_panes[tc][k];
@@ -1123,7 +1123,7 @@ fn collapseNeighbor(p: *Pardes, col: usize, index: usize) ?usize {
 }
 
 fn computeCollapsedColumn(p: *Pardes, c: usize, x: u16, width: u16, folded: usize) void {
-    var y: u16 = TOPBAR_H + p.columnBarHeight();
+    var y: u16 = p.topBarHeight() + p.columnBarHeight();
     const available = p.screen_h -| y;
     var expanded_left: usize = 0;
     var weight: f32 = 0;
@@ -1196,7 +1196,7 @@ pub fn compute(p: *Pardes) void {
         }
         if (vsum <= 0) vsum = 1;
 
-        var y: u16 = TOPBAR_H + p.columnBarHeight();
+        var y: u16 = p.topBarHeight() + p.columnBarHeight();
         const avail_h = p.screen_h -| y;
         for (0..p.col_n[c]) |k| {
             const id = p.col_panes[c][k];