dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dock: Don't close tab via action when it can't be closed via context menu (#1581)

Browse source 
Right now the last tab can be closed via the keyboard action, even
though it's explicitly not allowed to be closed via the context menu.
This can result in an invalid app state. This pull request takes the
same check that's currently done to decide whether the close button
should be drawn in the context menu, and adds it to the close action.
This commit is contained in:
Nico Gründel 2025-11-13 03:30:37 +01:00 committed by GitHub
parent d4c4b9ad37
commit a19826af2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/ui/src/dock/tab_panel.rs
View file

@ -101,6 +101,12 @@ impl Panel for TabPanel {
return false;
}
// 1. When is the final panel in the dock, it will not able to close.
// 2. When is in the Tiles, it will always able to close (by active panel state).
if !self.draggable(cx) && !self.in_tiles {
return false;
}
self.active_panel(cx)
.map(|panel| panel.closable(cx))
.unwrap_or(false)
@ -1111,6 +1117,9 @@ impl TabPanel {
window: &mut Window,
cx: &mut Context<Self>,
) {
if !self.closable(cx) {
return;
}
if let Some(panel) = self.active_panel(cx) {
self.remove_panel(panel, window, cx);
}
@ -1154,7 +1163,7 @@ impl Render for TabPanel {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl gpui::IntoElement {
let focus_handle = self.focus_handle(cx);
let active_panel = self.active_panel(cx);
let mut state = TabState {
let state = TabState {
closable: self.closable(cx),
draggable: self.draggable(cx),
droppable: self.droppable(cx),
@ -1162,12 +1171,6 @@ impl Render for TabPanel {
active_panel,
};
// 1. When is the final panel in the dock, it will not able to close.
// 2. When is in the Tiles, it will always able to close (by active panel state).
if !state.draggable && !self.in_tiles {
state.closable = false;
}
self.bind_actions(cx)
.id("tab-panel")
.track_focus(&focus_handle)