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

Update assistant header

Browse source
This commit is contained in:
Nate Butler 2023-12-19 10:57:36 -05:00
parent 57efaa92cf
commit 286f654517
3 changed files with 51 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

53
crates/assistant2/src/assistant_panel.rs
View file

@ -55,7 +55,7 @@ use std::{
use theme::ThemeSettings;
use ui::{
h_stack, prelude::*, v_stack, Button, ButtonLike, Icon, IconButton, IconElement, Label, TabBar,
Tooltip,
Tooltip, TAB_HEIGHT_IN_REMS,
};
use util::{paths::CONVERSATIONS_DIR, post_inc, ResultExt, TryFutureExt};
use uuid::Uuid;
@ -1129,45 +1129,36 @@ impl Render for AssistantPanel {
.border()
.border_color(gpui::red())
} else {
let title = self
.active_editor()
.map(|editor| Label::new(editor.read(cx).title(cx)));
// let mut header = h_stack()
// .p_1()
// .border_b()
// .border_color(cx.theme().colors().border_variant)
// .bg(cx.theme().colors().toolbar_background)
// .child(div().flex_1());
let header = TabBar::new("assistant_header")
.start_child(
h_stack()
.gap_1()
.child(Self::render_hamburger_button(cx))
.children(title),
h_stack().gap_1().child(Self::render_hamburger_button(cx)), // .children(title),
)
.children(self.active_editor().map(|editor| {
h_stack()
.h(rems(TAB_HEIGHT_IN_REMS))
.flex_1()
.px_2()
.child(Label::new(editor.read(cx).title(cx)).into_element())
}))
.end_child(if self.focus_handle.contains_focused(cx) {
h_stack()
.gap_1()
.children(self.render_editor_tools(cx))
.child(Self::render_plus_button(cx))
.child(self.render_zoom_button(cx))
.gap_2()
.child(h_stack().gap_1().children(self.render_editor_tools(cx)))
.child(
ui::Divider::vertical()
.inset()
.color(ui::DividerColor::Border),
)
.child(
h_stack()
.gap_1()
.child(Self::render_plus_button(cx))
.child(self.render_zoom_button(cx)),
)
} else {
div()
});
// if self.focus_handle.contains_focused(cx) {
// header = header.child(
// div()
// .flex()
// .gap_1()
// .children(self.render_editor_tools(cx))
// .child(Self::render_plus_button(cx))
// .child(self.render_zoom_button(cx)),
// );
// }
v_stack()
.size_full()
.on_action(cx.listener(|this, _: &workspace::NewFile, cx| {