mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-07 11:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Push language selector handler down into StatusBar

Browse source
This commit is contained in:
Marshall Bowers 2023-10-11 12:11:22 -04:00
parent 382693a199
commit b6a9c58994
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,9 @@
use std::marker::PhantomData;
use std::sync::atomic::Ordering;
use std::sync::Arc;
use crate::prelude::*;
use crate::{get_workspace_state, Button, ClickHandler, Icon, IconButton, IconColor, ToolDivider};
use crate::{get_workspace_state, Button, Icon, IconButton, IconColor, ToolDivider};
#[derive(Default, PartialEq)]
pub enum Tool {
@ -35,17 +36,15 @@ pub struct StatusBar<S: 'static + Send + Sync + Clone> {
left_tools: Option<ToolGroup>,
right_tools: Option<ToolGroup>,
bottom_tools: Option<ToolGroup>,
on_select_language: ClickHandler<S>,
}
impl<S: 'static + Send + Sync + Clone> StatusBar<S> {
pub fn new(on_select_language: ClickHandler<S>) -> Self {
pub fn new() -> Self {
Self {
state_type: PhantomData,
left_tools: None,
right_tools: None,
bottom_tools: None,
on_select_language,
}
}
@ -148,7 +147,23 @@ impl<S: 'static + Send + Sync + Clone> StatusBar<S> {
.items_center()
.gap_1()
.child(Button::new("116:25"))
.child(Button::new("Rust").on_click(self.on_select_language.clone())),
.child(Button::new("Rust").on_click(Arc::new(|_, cx| {
let is_showing_language_selector = workspace_state
.show_language_selector
.load(Ordering::SeqCst);
workspace_state
.show_language_selector
.compare_exchange(
is_showing_language_selector,
!is_showing_language_selector,
Ordering::SeqCst,
Ordering::SeqCst,
)
.unwrap();
cx.notify();
}))),
)
.child(ToolDivider::new())
.child(

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

@ -218,23 +218,7 @@ impl<S: 'static + Send + Sync + Clone> WorkspaceElement<S> {
.filter(|_| workspace_state.show_chat_panel.load(Ordering::SeqCst)),
),
)
.child(StatusBar::new(Arc::new(move |_, cx| {
let is_showing_language_selector = workspace_state
.show_language_selector
.load(Ordering::SeqCst);
workspace_state
.show_language_selector
.compare_exchange(
is_showing_language_selector,
!is_showing_language_selector,
Ordering::SeqCst,
Ordering::SeqCst,
)
.unwrap();
cx.notify();
})))
.child(StatusBar::new())
.children(
Some(
div()