Thread click handler through from workspace to language selector

Marshall Bowers committed 3 years ago

Commit 95ef61b1 parent c1426764 files · +46 −18Browse files

Unified · Split

4 files

crates/ui2/src/components/icon_button.rs +2 −2
crates/ui2/src/components/status_bar.rs +5 −5
crates/ui2/src/components/workspace.rs +33 −4
crates/ui2/src/elements/button.rs +6 −7

crates/ui2/src/components/icon_button.rs+2−2

@@ -4,10 +4,10 @@ use std::sync::Arc; · 3 unmodified lines
4	use gpui3::{Interactive, MouseButton};	4	use gpui3::{Interactive, MouseButton};
5		5
6	use crate::prelude::*;	6	use crate::prelude::*;
7	use crate::{theme, Icon, IconColor, IconElement};	7	use crate::{theme, ClickHandler, Icon, IconColor, IconElement};
8		8
9	struct IconButtonHandlers<S: 'static + Send + Sync> {	9	struct IconButtonHandlers<S: 'static + Send + Sync> {
10	click: Option<Arc<dyn Fn(&mut S, &mut ViewContext<S>) + 'static + Send + Sync>>,	10	click: Option<ClickHandler<S>>,
11	}	11	}
12		12
13	impl<S: 'static + Send + Sync> Default for IconButtonHandlers<S> {	13	impl<S: 'static + Send + Sync> Default for IconButtonHandlers<S> {

crates/ui2/src/components/status_bar.rs+5−5

 use std::marker::PhantomData;
 use crate::prelude::*;
-use crate::{Button, Icon, IconButton, IconColor, ToolDivider};
+use crate::{Button, ClickHandler, Icon, IconButton, IconColor, ToolDivider};
 #[derive(Default, PartialEq)]
 pub enum Tool {
     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() -> Self {
+    pub fn new(on_select_language: ClickHandler<S>) -> Self {
         Self {
             state_type: PhantomData,
             left_tools: None,
             right_tools: None,
             bottom_tools: None,
+            on_select_language,
         }
     }
                     .items_center()
                     .gap_1()
                     .child(Button::new("116:25"))
-                    .child(
+                    .child(Button::new("Rust").on_click(self.on_select_language.clone())),
-                        Button::new("Rust").on_click(|_, _| println!("Select Language clicked.")),
-                    ),
             )
             .child(ToolDivider::new())
             .child(

crates/ui2/src/components/workspace.rs+33−4

 use std::marker::PhantomData;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use chrono::DateTime;
 use crate::prelude::*;
 use crate::{
     hello_world_rust_editor_with_status_example, random_players_with_call_status, theme, v_stack,
-    ChatMessage, ChatPanel, EditorPane, Label, Livestream, Pane, PaneGroup, Panel,
+    ChatMessage, ChatPanel, EditorPane, Label, LanguageSelector, Livestream, Pane, PaneGroup,
-    PanelAllowedSides, PanelSide, ProjectPanel, SplitDirection, StatusBar, Terminal, TitleBar,
+    Panel, PanelAllowedSides, PanelSide, ProjectPanel, SplitDirection, StatusBar, Terminal,
-    Toast, ToastOrigin,
+    TitleBar, Toast, ToastOrigin,
 };
 #[derive(Element)]
     right_panel_scroll_state: ScrollState,
     tab_bar_scroll_state: ScrollState,
     bottom_panel_scroll_state: ScrollState,
+    show_language_selector: Arc<AtomicBool>,
 }
 impl<S: 'static + Send + Sync + Clone> WorkspaceElement<S> {
             right_panel_scroll_state: ScrollState::default(),
             tab_bar_scroll_state: ScrollState::default(),
             bottom_panel_scroll_state: ScrollState::default(),
+            show_language_selector: Arc::new(AtomicBool::new(false)),
         }
     }
     pub fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
         let theme = theme(cx).clone();
+        let show_language_selector = self.show_language_selector.clone();
         let temp_size = rems(36.).into();
         let root_group = PaneGroup::new_groups(
                         .side(PanelSide::Right),
                     ),
             )
-            .child(StatusBar::new())
+            .child(StatusBar::new(Arc::new(move |_, cx| {
+                let is_showing_language_selector = show_language_selector.load(Ordering::SeqCst);
+                show_language_selector
+                    .compare_exchange(
+                        is_showing_language_selector,
+                        !is_showing_language_selector,
+                        Ordering::SeqCst,
+                        Ordering::SeqCst,
+                    )
+                    .unwrap();
+                cx.notify();
+            })))
+            .children(
+                Some(
+                    div()
+                        .absolute()
+                        .top_0()
+                        .left_0()
+                        .z_index(999)
+                        .child(LanguageSelector::new()),
+                )
+                .filter(|_| self.show_language_selector.load(Ordering::SeqCst)),
+            )
             .child(Toast::new(
                 ToastOrigin::Bottom,
                 |_, _| vec![Label::new("A toast").into_any()],

crates/ui2/src/elements/button.rs+6−7

     Filled,
 }
+pub type ClickHandler<S> = Arc<dyn Fn(&mut S, &mut ViewContext<S>) + 'static + Send + Sync>;
 struct ButtonHandlers<S: 'static + Send + Sync> {
-    click: Option<Arc<dyn Fn(&mut S, &mut ViewContext<S>) + 'static + Send + Sync>>,
+    click: Option<ClickHandler<S>>,
 }
 impl<S: 'static + Send + Sync> Default for ButtonHandlers<S> {
         self
     }
-    pub fn on_click(
+    pub fn on_click(mut self, handler: ClickHandler<S>) -> Self {
-        mut self,
+        self.handlers.click = Some(handler);
-        handler: impl Fn(&mut S, &mut ViewContext<S>) + 'static + Send + Sync,
-    ) -> Self {
-        self.handlers.click = Some(Arc::new(handler));
         self
     }
                 .child(
                     Button::new("Label")
                         .variant(ButtonVariant::Ghost)
-                        .on_click(|_view, _cx| println!("Button clicked.")),
+                        .on_click(Arc::new(|_view, _cx| println!("Button clicked."))),
                 )
         }
     }

Thread click handler through from workspace to language selector

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code