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

Wire up toggling of project and chat panels

Browse source
This commit is contained in:
Marshall Bowers 2023-10-10 18:35:20 -04:00
parent 8e1638b773
commit a69f93d214
2 changed files with 90 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

48
crates/ui2/src/components/status_bar.rs
View file

@ -1,7 +1,8 @@
use std::marker::PhantomData; use std::marker::PhantomData;
use std::sync::atomic::Ordering;
use crate::prelude::*; use crate::prelude::*;
use crate::{Button, ClickHandler, Icon, IconButton, IconColor, ToolDivider}; use crate::{get_workspace_state, Button, ClickHandler, Icon, IconButton, IconColor, ToolDivider};
#[derive(Default, PartialEq)] #[derive(Default, PartialEq)]
pub enum Tool { pub enum Tool {
@ -104,7 +105,28 @@ impl<S: 'static + Send + Sync + Clone> StatusBar<S> {
.flex() .flex()
.items_center() .items_center()
.gap_1() .gap_1()
.child(IconButton::new(Icon::FileTree).color(IconColor::Accent)) .child(
IconButton::new(Icon::FileTree)
.color(IconColor::Accent)
.on_click(|_, cx| {
let workspace_state = get_workspace_state();
let is_showing_project_panel =
workspace_state.show_project_panel.load(Ordering::SeqCst);
workspace_state
.show_project_panel
.compare_exchange(
is_showing_project_panel,
!is_showing_project_panel,
Ordering::SeqCst,
Ordering::SeqCst,
)
.unwrap();
cx.notify();
}),
)
.child(IconButton::new(Icon::Hash)) .child(IconButton::new(Icon::Hash))
.child(ToolDivider::new()) .child(ToolDivider::new())
.child(IconButton::new(Icon::XCircle)) .child(IconButton::new(Icon::XCircle))
@ -145,10 +167,24 @@ impl<S: 'static + Send + Sync + Clone> StatusBar<S> {
.items_center() .items_center()
.gap_1() .gap_1()
.child(IconButton::new(Icon::Terminal)) .child(IconButton::new(Icon::Terminal))
.child( .child(IconButton::new(Icon::MessageBubbles).on_click(|_, cx| {
IconButton::new(Icon::MessageBubbles) let workspace_state = get_workspace_state();
.on_click(|_, _| println!("Chat Panel clicked.")),
) let is_showing_chat_panel =
workspace_state.show_chat_panel.load(Ordering::SeqCst);
workspace_state
.show_chat_panel
.compare_exchange(
is_showing_chat_panel,
!is_showing_chat_panel,
Ordering::SeqCst,
Ordering::SeqCst,
)
.unwrap();
cx.notify();
}))
.child(IconButton::new(Icon::Ai)), .child(IconButton::new(Icon::Ai)),
) )
} }

84
crates/ui2/src/components/workspace.rs
View file

@ -14,6 +14,8 @@ use crate::{
}; };
pub struct WorkspaceState { pub struct WorkspaceState {
pub show_project_panel: Arc<AtomicBool>,
pub show_chat_panel: Arc<AtomicBool>,
pub show_language_selector: Arc<AtomicBool>, pub show_language_selector: Arc<AtomicBool>,
} }
@ -21,8 +23,10 @@ pub struct WorkspaceState {
/// I can get an explainer on how we should actually be managing state. /// I can get an explainer on how we should actually be managing state.
static WORKSPACE_STATE: OnceLock<WorkspaceState> = OnceLock::new(); static WORKSPACE_STATE: OnceLock<WorkspaceState> = OnceLock::new();
fn get_workspace_state() -> &'static WorkspaceState { pub fn get_workspace_state() -> &'static WorkspaceState {
let state = WORKSPACE_STATE.get_or_init(|| WorkspaceState { let state = WORKSPACE_STATE.get_or_init(|| WorkspaceState {
show_project_panel: Arc::new(AtomicBool::new(true)),
show_chat_panel: Arc::new(AtomicBool::new(true)),
show_language_selector: Arc::new(AtomicBool::new(false)), show_language_selector: Arc::new(AtomicBool::new(false)),
}); });
@ -136,13 +140,18 @@ impl<S: 'static + Send + Sync + Clone> WorkspaceElement<S> {
.border_t() .border_t()
.border_b() .border_b()
.border_color(theme.lowest.base.default.border) .border_color(theme.lowest.base.default.border)
.child( .children(
Panel::new( Some(
self.left_panel_scroll_state.clone(), Panel::new(
|_, payload| vec![ProjectPanel::new(ScrollState::default()).into_any()], self.left_panel_scroll_state.clone(),
Box::new(()), |_, payload| {
vec![ProjectPanel::new(ScrollState::default()).into_any()]
},
Box::new(()),
)
.side(PanelSide::Left),
) )
.side(PanelSide::Left), .filter(|_| workspace_state.show_project_panel.load(Ordering::SeqCst)),
) )
.child( .child(
v_stack() v_stack()
@ -169,36 +178,39 @@ impl<S: 'static + Send + Sync + Clone> WorkspaceElement<S> {
.side(PanelSide::Bottom), .side(PanelSide::Bottom),
), ),
) )
.child( .children(
Panel::new( Some(
self.right_panel_scroll_state.clone(), Panel::new(
|_, payload| { self.right_panel_scroll_state.clone(),
vec![ChatPanel::new(ScrollState::default()) |_, payload| {
.with_messages(vec![ vec![ChatPanel::new(ScrollState::default())
ChatMessage::new( .with_messages(vec![
"osiewicz".to_string(), ChatMessage::new(
"is this thing on?".to_string(), "osiewicz".to_string(),
DateTime::parse_from_rfc3339( "is this thing on?".to_string(),
"2023-09-27T15:40:52.707Z", DateTime::parse_from_rfc3339(
) "2023-09-27T15:40:52.707Z",
.unwrap() )
.naive_local(), .unwrap()
), .naive_local(),
ChatMessage::new( ),
"maxdeviant".to_string(), ChatMessage::new(
"Reading you loud and clear!".to_string(), "maxdeviant".to_string(),
DateTime::parse_from_rfc3339( "Reading you loud and clear!".to_string(),
"2023-09-28T15:40:52.707Z", DateTime::parse_from_rfc3339(
) "2023-09-28T15:40:52.707Z",
.unwrap() )
.naive_local(), .unwrap()
), .naive_local(),
]) ),
.into_any()] ])
}, .into_any()]
Box::new(()), },
Box::new(()),
)
.side(PanelSide::Right),
) )
.side(PanelSide::Right), .filter(|_| workspace_state.show_chat_panel.load(Ordering::SeqCst)),
), ),
) )
.child(StatusBar::new(Arc::new(move |_, cx| { .child(StatusBar::new(Arc::new(move |_, cx| {