starred/tty7
1
0
Fork 0
mirror of https://github.com/l0ng-ai/tty7.git synced 2026-09-22 16:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows): un-swallow the sidebar collapse/new-tab buttons

Browse Source 
The rail's control row is a `WindowControlArea::Drag` so the window can be
dragged by it. On Windows that maps to HTCAPTION, so the OS claims clicks as
window-drags before GPUI hit-tests — the "+" and collapse tiles never fired
their `on_click`, and collapsing the sidebar did nothing. (Fine on macOS,
where titlebar dragging doesn't gate child hit-testing, so it looked correct
there.)

Wrap both tiles in an `occlude()` div — a BlockMouse hitbox that stops
hit-testing on the button — exactly as the title-strip chrome tiles already
do.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
thomas
2026-07-25 10:12:52 +08:00
co-authored by Claude Opus 4.8
parent 7d190a8298
commit a00abe1c09
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/tab_sidebar.rs
+33 -21
View File
@@ -755,36 +755,48 @@ impl Tty7App {
.gap(px(2.))
// Glyph, not hit box, on the content edge — see `TILE_PAD`.
.pr(px(crate::ui::app::CONTENT_INSET - crate::ui::app::TILE_PAD))
// Both tiles are wrapped in an `occlude()` div, exactly like the
// title-strip chrome. This row is a `WindowControlArea::Drag` (set
// below), which on Windows maps to HTCAPTION — the OS claims the click
// as a window-drag before gpui ever hit-tests, so a bare button never
// fires its `on_click`. `occlude()` gives each a BlockMouse hitbox so
// hit-testing stops on the button. (No-op on macOS, where titlebar
// dragging doesn't gate child hit-testing — which is why this worked
// there and silently did nothing on Windows.)
.child(
self.attach_new_tab_menu(
// `chrome_tile`, not `ghost()`: this "+" sits beside the
// collapse tile and the title bar's own "+", and ghost's
// hover is a heavier, differently-derived grey.
div().occlude().flex_shrink_0().child(
self.attach_new_tab_menu(
// `chrome_tile`, not `ghost()`: this "+" sits beside the
// collapse tile and the title bar's own "+", and ghost's
// hover is a heavier, differently-derived grey.
crate::ui::tab_strip::chrome_tile(
Button::new("sidebar-add").icon(Icon::new(IconName::Plus).size(px(18.))),
false,
cx,
)
.xsmall()
.w(px(32.))
.h(px(32.))
.rounded_lg(),
cx,
),
),
)
.child(
div().occlude().flex_shrink_0().child(
crate::ui::tab_strip::chrome_tile(
Button::new("sidebar-add").icon(Icon::new(IconName::Plus).size(px(18.))),
Button::new("sidebar-collapse")
.icon(Icon::empty().path("icons/panel-left.svg").size(px(18.))),
false,
cx,
)
.xsmall()
.w(px(32.))
.h(px(32.))
.rounded_lg(),
cx,
.rounded_lg()
.tooltip("Hide Sidebar")
.on_click(cx.listener(|this, _, _window, cx| this.toggle_left_panel(cx))),
),
)
.child(
crate::ui::tab_strip::chrome_tile(
Button::new("sidebar-collapse")
.icon(Icon::empty().path("icons/panel-left.svg").size(px(18.))),
false,
cx,
)
.xsmall()
.w(px(32.))
.h(px(32.))
.rounded_lg()
.tooltip("Hide Sidebar")
.on_click(cx.listener(|this, _, _window, cx| this.toggle_left_panel(cx))),
);
// Borderless "Search tabs…" that sits directly on the sunk surface: a
// leading magnifier + an appearance-less input, no box and no divider