Merge branch 'main' into collab_ui2

This commit is contained in:
Conrad Irwin 2023-11-16 22:01:35 -07:00
commit 6d4276ea5f
58 changed files with 940 additions and 519 deletions

View file

@ -7,7 +7,6 @@ use gpui::{
overlay, px, Action, AnchorCorner, AnyElement, Bounds, DispatchPhase, Div, EventEmitter,
FocusHandle, FocusableView, LayoutId, MouseButton, MouseDownEvent, Pixels, Point, Render, View,
};
use smallvec::SmallVec;
pub struct ContextMenu {
items: Vec<ListItem>,
@ -269,16 +268,15 @@ pub use stories::*;
mod stories {
use super::*;
use crate::story::Story;
use gpui::{action, Div, Render, VisualContext};
use gpui::{actions, Div, Render, VisualContext};
#[action]
struct PrintCurrentDate {}
actions!(PrintCurrentDate);
fn build_menu(cx: &mut WindowContext, header: impl Into<SharedString>) -> View<ContextMenu> {
cx.build_view(|cx| {
ContextMenu::new(cx).header(header).separator().entry(
Label::new("Print current time"),
PrintCurrentDate {}.boxed_clone(),
PrintCurrentDate.boxed_clone(),
)
})
}