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

Don't show navigation controls for terminal panel

Browse source
This commit is contained in:
Antonio Scandurra 2023-05-25 15:15:20 +02:00
parent 414b97adce
commit aa8c0475b1
3 changed files with 98 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,6 +55,7 @@ impl TerminalPanel {
cx, cx,
); );
pane.set_can_split(false, cx); pane.set_can_split(false, cx);
pane.set_can_navigate(false, cx);
pane.on_can_drop(move |drag_and_drop, cx| { pane.on_can_drop(move |drag_and_drop, cx| {
drag_and_drop drag_and_drop
.currently_dragged::<DraggedItem>(window_id) .currently_dragged::<DraggedItem>(window_id)

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

@ -164,6 +164,7 @@ pub struct Pane {
has_focus: bool, has_focus: bool,
can_drop: Rc<dyn Fn(&DragAndDrop<Workspace>, &WindowContext) -> bool>, can_drop: Rc<dyn Fn(&DragAndDrop<Workspace>, &WindowContext) -> bool>,
can_split: bool, can_split: bool,
can_navigate: bool,
render_tab_bar_buttons: Rc<dyn Fn(&mut Pane, &mut ViewContext<Pane>) -> AnyElement<Pane>>, render_tab_bar_buttons: Rc<dyn Fn(&mut Pane, &mut ViewContext<Pane>) -> AnyElement<Pane>>,
} }
@ -279,6 +280,7 @@ impl Pane {
has_focus: false, has_focus: false,
can_drop: Rc::new(|_, _| true), can_drop: Rc::new(|_, _| true),
can_split: true, can_split: true,
can_navigate: true,
render_tab_bar_buttons: Rc::new(|pane, cx| { render_tab_bar_buttons: Rc::new(|pane, cx| {
Flex::row() Flex::row()
// New menu // New menu
@ -346,6 +348,14 @@ impl Pane {
cx.notify(); cx.notify();
} }
pub fn set_can_navigate(&mut self, can_navigate: bool, cx: &mut ViewContext<Self>) {
self.can_navigate = can_navigate;
self.toolbar.update(cx, |toolbar, cx| {
toolbar.set_can_navigate(can_navigate, cx);
});
cx.notify();
}
pub fn set_render_tab_bar_buttons<F>(&mut self, cx: &mut ViewContext<Self>, render: F) pub fn set_render_tab_bar_buttons<F>(&mut self, cx: &mut ViewContext<Self>, render: F)
where where
F: 'static + Fn(&mut Pane, &mut ViewContext<Pane>) -> AnyElement<Pane>, F: 'static + Fn(&mut Pane, &mut ViewContext<Pane>) -> AnyElement<Pane>,
@ -430,6 +440,10 @@ impl Pane {
cx: &mut ViewContext<Workspace>, cx: &mut ViewContext<Workspace>,
) -> Task<Result<()>> { ) -> Task<Result<()>> {
let to_load = if let Some(pane) = pane.upgrade(cx) { let to_load = if let Some(pane) = pane.upgrade(cx) {
if !pane.read(cx).can_navigate {
return Task::ready(Ok(()));
}
cx.focus(&pane); cx.focus(&pane);
pane.update(cx, |pane, cx| { pane.update(cx, |pane, cx| {

149
crates/workspace/src/toolbar.rs
View file

@ -53,6 +53,7 @@ pub enum ToolbarItemLocation {
pub struct Toolbar { pub struct Toolbar {
active_pane_item: Option<Box<dyn ItemHandle>>, active_pane_item: Option<Box<dyn ItemHandle>>,
hidden: bool, hidden: bool,
can_navigate: bool,
pane: WeakViewHandle<Pane>, pane: WeakViewHandle<Pane>,
items: Vec<(Box<dyn ToolbarItemViewHandle>, ToolbarItemLocation)>, items: Vec<(Box<dyn ToolbarItemViewHandle>, ToolbarItemLocation)>,
} }
@ -132,76 +133,86 @@ impl View for Toolbar {
let button_style = theme.nav_button; let button_style = theme.nav_button;
let tooltip_style = theme::current(cx).tooltip.clone(); let tooltip_style = theme::current(cx).tooltip.clone();
Flex::column() let mut primary_items = Flex::row();
.with_child( if self.can_navigate {
Flex::row() primary_items.add_child(nav_button(
.with_child(nav_button( "icons/arrow_left_16.svg",
"icons/arrow_left_16.svg", button_style,
button_style, nav_button_height,
nav_button_height, tooltip_style.clone(),
tooltip_style.clone(), enable_go_backward,
enable_go_backward, spacing,
spacing, {
let pane = pane.clone();
move |toolbar, cx| {
if let Some(workspace) = toolbar
.pane
.upgrade(cx)
.and_then(|pane| pane.read(cx).workspace().upgrade(cx))
{ {
let pane = pane.clone(); let pane = pane.clone();
move |toolbar, cx| { cx.window_context().defer(move |cx| {
if let Some(workspace) = toolbar workspace.update(cx, |workspace, cx| {
.pane Pane::go_back(workspace, Some(pane.clone()), cx)
.upgrade(cx) .detach_and_log_err(cx);
.and_then(|pane| pane.read(cx).workspace().upgrade(cx)) });
{ })
let pane = pane.clone(); }
cx.window_context().defer(move |cx| { }
workspace.update(cx, |workspace, cx| { },
Pane::go_back(workspace, Some(pane.clone()), cx) super::GoBack { pane: None },
.detach_and_log_err(cx); "Go Back",
}); cx,
}) ));
} primary_items.add_child(nav_button(
} "icons/arrow_right_16.svg",
}, button_style,
super::GoBack { pane: None }, nav_button_height,
"Go Back", tooltip_style,
cx, enable_go_forward,
)) spacing,
.with_child(nav_button( {
"icons/arrow_right_16.svg", let pane = pane.clone();
button_style, move |toolbar, cx| {
nav_button_height, if let Some(workspace) = toolbar
tooltip_style, .pane
enable_go_forward, .upgrade(cx)
spacing, .and_then(|pane| pane.read(cx).workspace().upgrade(cx))
{ {
let pane = pane.clone(); let pane = pane.clone();
move |toolbar, cx| { cx.window_context().defer(move |cx| {
if let Some(workspace) = toolbar workspace.update(cx, |workspace, cx| {
.pane Pane::go_forward(workspace, Some(pane.clone()), cx)
.upgrade(cx) .detach_and_log_err(cx);
.and_then(|pane| pane.read(cx).workspace().upgrade(cx)) });
{ });
let pane = pane.clone(); }
cx.window_context().defer(move |cx| { }
workspace.update(cx, |workspace, cx| { },
Pane::go_forward(workspace, Some(pane.clone()), cx) super::GoForward { pane: None },
.detach_and_log_err(cx); "Go Forward",
}); cx,
}); ));
} }
} primary_items.extend(primary_left_items);
}, primary_items.extend(primary_right_items);
super::GoForward { pane: None },
"Go Forward", let mut toolbar = Flex::column();
cx, if !primary_items.is_empty() {
)) toolbar.add_child(primary_items.constrained().with_height(height));
.with_children(primary_left_items) }
.with_children(primary_right_items) if let Some(secondary_item) = secondary_item {
.constrained() toolbar.add_child(secondary_item);
.with_height(height), }
)
.with_children(secondary_item) if toolbar.is_empty() {
.contained() toolbar.into_any_named("toolbar")
.with_style(container_style) } else {
.into_any_named("toolbar") toolbar
.contained()
.with_style(container_style)
.into_any_named("toolbar")
}
} }
} }
@ -264,9 +275,15 @@ impl Toolbar {
pane, pane,
items: Default::default(), items: Default::default(),
hidden: false, hidden: false,
can_navigate: true,
} }
} }
pub fn set_can_navigate(&mut self, can_navigate: bool, cx: &mut ViewContext<Self>) {
self.can_navigate = can_navigate;
cx.notify();
}
pub fn add_item<T>(&mut self, item: ViewHandle<T>, cx: &mut ViewContext<Self>) pub fn add_item<T>(&mut self, item: ViewHandle<T>, cx: &mut ViewContext<Self>)
where where
T: 'static + ToolbarItemView, T: 'static + ToolbarItemView,