Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pane: Disable the "Close..." controls depending on certain scenarios (#25037)

Browse source 
Closes https://github.com/zed-industries/zed/issues/12471

- Disables "Close Others" if there's just one tab
- Disables "Close Left"/"Close Right" if the above is true or if there's
no tabs to the left/right side of the active tab

Release Notes:

- N/A
This commit is contained in:
Danilo Leal 2025-02-17 18:01:13 -03:00 • committed by GitHub
parent dc11a61ff8
commit a99696b95f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 58 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

108
crates/workspace/src/pane.rs
View file

@ -40,11 +40,11 @@ use std::{
}; };
use theme::ThemeSettings; use theme::ThemeSettings;
use ui::{ use ui::{
prelude::*, right_click_menu, ButtonSize, Color, DecoratedIcon, IconButton, IconButtonShape, prelude::*, right_click_menu, ButtonSize, Color, ContextMenu, ContextMenuEntry,
IconDecoration, IconDecorationKind, IconName, IconSize, Indicator, Label, PopoverMenu, ContextMenuItem, DecoratedIcon, IconButton, IconButtonShape, IconDecoration,
PopoverMenuHandle, Tab, TabBar, TabPosition, Tooltip, IconDecorationKind, IconName, IconSize, Indicator, Label, PopoverMenu, PopoverMenuHandle, Tab,
TabBar, TabPosition, Tooltip,
}; };
use ui::{v_flex, ContextMenu};
use util::{debug_panic, maybe, truncate_and_remove_front, ResultExt}; use util::{debug_panic, maybe, truncate_and_remove_front, ResultExt};
/// A selected entry in e.g. project panel. /// A selected entry in e.g. project panel.
@ -2395,6 +2395,9 @@ impl Pane {
} }
}; };
let total_items = self.items.len();
let has_items_to_left = ix > 0;
let has_items_to_right = ix < total_items - 1;
let is_pinned = self.is_tab_pinned(ix); let is_pinned = self.is_tab_pinned(ix);
let pane = cx.entity().downgrade(); let pane = cx.entity().downgrade();
let menu_context = item.item_focus_handle(cx); let menu_context = item.item_focus_handle(cx);
@ -2415,54 +2418,59 @@ impl Pane {
.detach_and_log_err(cx); .detach_and_log_err(cx);
}), }),
) )
.entry( .item(ContextMenuItem::Entry(
"Close Others", ContextMenuEntry::new("Close Others")
Some(Box::new(CloseInactiveItems { .action(Some(Box::new(CloseInactiveItems {
save_intent: None, save_intent: None,
close_pinned: false, close_pinned: false,
})), })))
window.handler_for(&pane, move |pane, window, cx| { .disabled(total_items == 1)
pane.close_items(window, cx, SaveIntent::Close, |id| id != item_id) .handler(window.handler_for(&pane, move |pane, window, cx| {
pane.close_items(window, cx, SaveIntent::Close, |id| {
id != item_id
})
.detach_and_log_err(cx); .detach_and_log_err(cx);
}), })),
) ))
.separator() .separator()
.entry( .item(ContextMenuItem::Entry(
"Close Left", ContextMenuEntry::new("Close Left")
Some(Box::new(CloseItemsToTheLeft { .action(Some(Box::new(CloseItemsToTheLeft {
close_pinned: false, close_pinned: false,
})), })))
window.handler_for(&pane, move |pane, window, cx| { .disabled(!has_items_to_left)
pane.close_items_to_the_left_by_id( .handler(window.handler_for(&pane, move |pane, window, cx| {
item_id, pane.close_items_to_the_left_by_id(
&CloseItemsToTheLeft { item_id,
close_pinned: false, &CloseItemsToTheLeft {
}, close_pinned: false,
pane.get_non_closeable_item_ids(false), },
window, pane.get_non_closeable_item_ids(false),
cx, window,
) cx,
.detach_and_log_err(cx); )
}), .detach_and_log_err(cx);
) })),
.entry( ))
"Close Right", .item(ContextMenuItem::Entry(
Some(Box::new(CloseItemsToTheRight { ContextMenuEntry::new("Close Right")
close_pinned: false, .action(Some(Box::new(CloseItemsToTheRight {
})), close_pinned: false,
window.handler_for(&pane, move |pane, window, cx| { })))
pane.close_items_to_the_right_by_id( .disabled(!has_items_to_right)
item_id, .handler(window.handler_for(&pane, move |pane, window, cx| {
&CloseItemsToTheRight { pane.close_items_to_the_right_by_id(
close_pinned: false, item_id,
}, &CloseItemsToTheRight {
pane.get_non_closeable_item_ids(false), close_pinned: false,
window, },
cx, pane.get_non_closeable_item_ids(false),
) window,
.detach_and_log_err(cx); cx,
}), )
) .detach_and_log_err(cx);
})),
))
.separator() .separator()
.entry( .entry(
"Close Clean", "Close Clean",