Commit 2bfd2c325dbad48b099155c8aee21fcd5b3a5ee5 | snowbound

author	clover caruso <git@paperclover.net> 2026-10-02 21:10:55-07:00
committer	clover caruso <git@paperclover.net> 2026-10-03 07:05:30-07:00
log	2bfd2c325dbad48b099155c8aee21fcd5b3a5ee5
tree	23fcff547110e9073cae04ddd411d54344dd504a
parent	c5f2777d27e890082216a8d8eb1dacee4d4a104f
signature	Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

fix: the notebook button leads the tab row, Back and Forward after it

Shut, the tab row starts with the notebook button, then Back and Forward; open,
the button closes the sidebar from the column's left and Back and Forward follow
it, ahead of "My Notebooks", so neither moves past the other as the sidebar eases.

Assisted-by: claude-opus-5.5

2 files changed, 27 insertions(+), 20 deletions(-)

crates
- snowbound
  - src
    main.rs
    sidebar.rs

crates/snowbound/src/main.rs+3-3

...	@@ -1722,9 +1722,9 @@ impl State {	...	@@ -1722,9 +1722,9 @@ impl State {
1722	);	1722	);
1723	if !self.temporary {	1723	if !self.temporary {
1724	// Past the row's padding, the frame's corner and the first tab's shadow, the tabs'	1724	// Past the row's padding, the frame's corner and the first tab's shadow, the tabs'
1725	// outlines start where Back and Forward end, and on the left the notebook button's	1725	// outlines start where Back and Forward end, after the notebook button's square on
1726	// square after them; that room shrinks on the sidebar's easing, as they move into	1726	// the left; that room shrinks on the sidebar's easing, as they move into its
1727	// its header, so the tabs ease with it.	1727	// header, so the tabs ease with it.
1728	let room = sidebar::NAV + TAB_ROW - FRAME - self.rounding() - ui::SHADOW[0];	1728	let room = sidebar::NAV + TAB_ROW - FRAME - self.rounding() - ui::SHADOW[0];
1729	let room = if self.navigation_bar_right {	1729	let room = if self.navigation_bar_right {
1730	room - TAB_ROW	1730	room - TAB_ROW

crates/snowbound/src/sidebar.rs+24-17

 @@ -196,10 +196,17 @@ fn sidebar(
             ..Spec::default()
         },
     );
+    // Room for what floats over the header's start: the notebook button's icon, and on the
+    // left Back and Forward after it.
+    let start = if right {
+        ICON
+    } else {
+        (ICON + RAIL) / 2.0 + NAV - ROW_PAD
+    };
     ui.leaf(
         "icon",
         Spec {
-            size: [px(ICON), px(ui::shell::TOOL)],
+            size: [px(start), px(ui::shell::TOOL)],
             ..Spec::default()
         },
     );
 @@ -212,15 +219,16 @@ fn sidebar(
             ..Spec::default()
         },
     );
-    // Room for what floats over the header's end.
+    // Room for the notebook button floating over the header's end.
-    let end = if right { RAIL } else { NAV + MARGIN };
+    if right {
-    ui.leaf(
+        ui.leaf(
-        "end",
+            "end",
-        Spec {
+            Spec {
-            size: [px(end - MARGIN - 2.0 * ROW_PAD), px(1.0)],
+                size: [px(RAIL - MARGIN - 2.0 * ROW_PAD), px(1.0)],
-            ..Spec::default()
+                ..Spec::default()
-        },
+            },
-    );
+        );
+    }
     ui.close();
     if !rows {
         return;
 @@ -970,10 +978,10 @@ impl crate::State {
         }
     }
-    /// Back, Forward and the notebook button, floating at the body's corner over the section
+    /// The notebook button, then Back and Forward, floating at the body's corner over the
-    /// tabs' row, `height` tall as it eases. While the sidebar, `width` wide as it eases, is
+    /// section tabs' row, `height` tall as it eases. While the sidebar, `width` wide as it
-    /// open on the left, the notebook button closes it from its header's icon, and Back and
+    /// eases, is open on the left, the notebook button closes it from its header's icon, Back
-    /// Forward ride its end.
+    /// and Forward after it.
     pub(crate) fn sidebar_button(&mut self, height: f32, width: f32) {
         use crate::commands::{Choice, Id as Cmd};
         if self.temporary {
 @@ -987,9 +995,8 @@ impl crate::State {
                 .map_or(0.0, |[left, _, right, _]| right - left - RAIL);
             (0.0, edge)
         } else {
-            let open = MARGIN + ROW_PAD - (RAIL - ICON) / 2.0;
+            let toggle = (MARGIN + ROW_PAD - (RAIL - ICON) / 2.0) * width / WIDTH;
-            let toggle = NAV + (open - NAV) * width / WIDTH;
+            (toggle + RAIL, toggle)
-            ((width - NAV - MARGIN).max(0.0), toggle)
         };
         let pad = [
             (RAIL - ui::shell::TOOL) / 2.0,