Allow negative gap for tab indicators

Also gate on render_above_top_layer(), since otherwise tab indicators with a negative gap will render on top of the fullscreen window.
YaLTeR · Feb 4, 2025 · 16ca9ff · 16ca9ff
1 parent b31a4b3
commit 16ca9ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs
@@ -679,7 +679,7 @@ pub struct TabIndicator {
     #[knuffel(child)]
     pub off: bool,
     #[knuffel(child, unwrap(argument), default = Self::default().gap)]
-    pub gap: FloatOrInt<0, 65535>,
+    pub gap: FloatOrInt<-65535, 65535>,
     #[knuffel(child, unwrap(argument), default = Self::default().width)]
     pub width: FloatOrInt<0, 65535>,
     #[knuffel(child, default = Self::default().length)]

diff --git a/src/layout/scrolling.rs b/src/layout/scrolling.rs
@@ -2467,7 +2467,7 @@ impl<W: LayoutElement> ScrollingSpace<W> {
             let col_render_off = col.render_offset();
 
             // Draw the tab indicator on top.
-            {
+            if !self.render_above_top_layer() {
                 // This is the "static tile position" so to say: it excludes the tile offset (used
                 // for e.g. centering smaller tiles in always-center) and the tile render offset
                 // (used for tile-specific animations).