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

terminal: hide navigation buttons (#10847)

Browse source 
We were effectively discarding value set by display_nav_history_buttons
once we've updated settings for a pane. This commit adds another bit of
state to display_nav_history_buttons by allowing it to hard-deny setting
updates.

Release Notes:

- Fixed a bug that caused disabled navigation buttons to show up in
terminal panel.
This commit is contained in:
Piotr Osiewicz 2024-04-22 14:38:16 +02:00 • committed by GitHub
parent 74241d9f93
commit 615de381da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/terminal_view/src/terminal_panel.rs
View file

@ -71,7 +71,7 @@ impl TerminalPanel {
); );
pane.set_can_split(false, cx); pane.set_can_split(false, cx);
pane.set_can_navigate(false, cx); pane.set_can_navigate(false, cx);
pane.display_nav_history_buttons(false); pane.display_nav_history_buttons(None);
pane.set_render_tab_bar_buttons(cx, move |pane, cx| { pane.set_render_tab_bar_buttons(cx, move |pane, cx| {
let terminal_panel = terminal_panel.clone(); let terminal_panel = terminal_panel.clone();
h_flex() h_flex()

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

@ -206,7 +206,9 @@ pub struct Pane {
render_tab_bar_buttons: Rc<dyn Fn(&mut Pane, &mut ViewContext<Pane>) -> AnyElement>, render_tab_bar_buttons: Rc<dyn Fn(&mut Pane, &mut ViewContext<Pane>) -> AnyElement>,
_subscriptions: Vec<Subscription>, _subscriptions: Vec<Subscription>,
tab_bar_scroll_handle: ScrollHandle, tab_bar_scroll_handle: ScrollHandle,
display_nav_history_buttons: bool, /// Is None if navigation buttons are permanently turned off (and should not react to setting changes).
/// Otherwise, when `display_nav_history_buttons` is Some, it determines whether nav buttons should be displayed.
display_nav_history_buttons: Option<bool>,
double_click_dispatch_action: Box<dyn Action>, double_click_dispatch_action: Box<dyn Action>,
} }
@ -378,7 +380,9 @@ impl Pane {
}) })
.into_any_element() .into_any_element()
}), }),
display_nav_history_buttons: TabBarSettings::get_global(cx).show_nav_history_buttons, display_nav_history_buttons: Some(
TabBarSettings::get_global(cx).show_nav_history_buttons,
),
_subscriptions: subscriptions, _subscriptions: subscriptions,
double_click_dispatch_action, double_click_dispatch_action,
} }
@ -447,8 +451,9 @@ impl Pane {
} }
fn settings_changed(&mut self, cx: &mut ViewContext<Self>) { fn settings_changed(&mut self, cx: &mut ViewContext<Self>) {
self.display_nav_history_buttons = TabBarSettings::get_global(cx).show_nav_history_buttons; if let Some(display_nav_history_buttons) = self.display_nav_history_buttons.as_mut() {
*display_nav_history_buttons = TabBarSettings::get_global(cx).show_nav_history_buttons;
}
if !PreviewTabsSettings::get_global(cx).enabled { if !PreviewTabsSettings::get_global(cx).enabled {
self.preview_item_id = None; self.preview_item_id = None;
} }
@ -1663,32 +1668,37 @@ impl Pane {
fn render_tab_bar(&mut self, cx: &mut ViewContext<'_, Pane>) -> impl IntoElement { fn render_tab_bar(&mut self, cx: &mut ViewContext<'_, Pane>) -> impl IntoElement {
TabBar::new("tab_bar") TabBar::new("tab_bar")
.track_scroll(self.tab_bar_scroll_handle.clone()) .track_scroll(self.tab_bar_scroll_handle.clone())
.when(self.display_nav_history_buttons, |tab_bar| { .when(
tab_bar.start_child( self.display_nav_history_buttons.unwrap_or_default(),
h_flex() |tab_bar| {
.gap_2() tab_bar.start_child(
.child( h_flex()
IconButton::new("navigate_backward", IconName::ArrowLeft) .gap_2()
.icon_size(IconSize::Small) .child(
.on_click({ IconButton::new("navigate_backward", IconName::ArrowLeft)
let view = cx.view().clone(); .icon_size(IconSize::Small)
move |_, cx| view.update(cx, Self::navigate_backward) .on_click({
}) let view = cx.view().clone();
.disabled(!self.can_navigate_backward()) move |_, cx| view.update(cx, Self::navigate_backward)
.tooltip(|cx| Tooltip::for_action("Go Back", &GoBack, cx)), })
) .disabled(!self.can_navigate_backward())
.child( .tooltip(|cx| Tooltip::for_action("Go Back", &GoBack, cx)),
IconButton::new("navigate_forward", IconName::ArrowRight) )
.icon_size(IconSize::Small) .child(
.on_click({ IconButton::new("navigate_forward", IconName::ArrowRight)
let view = cx.view().clone(); .icon_size(IconSize::Small)
move |_, cx| view.update(cx, Self::navigate_forward) .on_click({
}) let view = cx.view().clone();
.disabled(!self.can_navigate_forward()) move |_, cx| view.update(cx, Self::navigate_forward)
.tooltip(|cx| Tooltip::for_action("Go Forward", &GoForward, cx)), })
), .disabled(!self.can_navigate_forward())
) .tooltip(|cx| {
}) Tooltip::for_action("Go Forward", &GoForward, cx)
}),
),
)
},
)
.when(self.has_focus(cx), |tab_bar| { .when(self.has_focus(cx), |tab_bar| {
tab_bar.end_child({ tab_bar.end_child({
let render_tab_buttons = self.render_tab_bar_buttons.clone(); let render_tab_buttons = self.render_tab_bar_buttons.clone();
@ -1921,7 +1931,7 @@ impl Pane {
.log_err(); .log_err();
} }
pub fn display_nav_history_buttons(&mut self, display: bool) { pub fn display_nav_history_buttons(&mut self, display: Option<bool>) {
self.display_nav_history_buttons = display; self.display_nav_history_buttons = display;
} }
} }