mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 02:48:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

WIP

Browse source
This commit is contained in:
Mikayla Maki 2023-03-01 20:42:01 -08:00
parent 62aeb6b8b3
commit 9dee2ca2be
3 changed files with 143 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
crates/project_panel/src/project_panel.rs
View file

@ -5,9 +5,11 @@ use futures::stream::StreamExt;
use gpui::{
actions,
anyhow::{anyhow, Result},
color::Color,
elements::{
AnchorCorner, ChildView, ConstrainedBox, ContainerStyle, Empty, Flex, Label,
MouseEventHandler, ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState,
AnchorCorner, Canvas, ChildView, ConstrainedBox, ContainerStyle, Empty, Flex,
KeystrokeLabel, Label, MouseEventHandler, ParentElement, ScrollTarget, Stack, Svg,
UniformList, UniformListState,
},
geometry::vector::Vector2F,
impl_internal_actions,
@ -1262,6 +1264,9 @@ impl View for ProjectPanel {
let padding = std::mem::take(&mut container_style.padding);
let last_worktree_root_id = self.last_worktree_root_id;
let has_worktree = self.visible_entries.len() != 0;
if has_worktree {
Stack::new()
.with_child(
MouseEventHandler::<ProjectPanel>::new(0, cx, |_, cx| {
@ -1310,6 +1315,83 @@ impl View for ProjectPanel {
)
.with_child(ChildView::new(&self.context_menu, cx).boxed())
.boxed()
} else {
let parent_view_id = cx.handle().id();
Stack::new()
.with_child(
MouseEventHandler::<ProjectPanel>::new(1, cx, |_, cx| {
Stack::new()
.with_child(
Canvas::new(|bounds, _visible_bounds, cx| {
cx.scene.push_quad(gpui::Quad {
bounds,
background: Some(Color::red()),
..Default::default()
})
})
.boxed(),
)
.with_child(
MouseEventHandler::<Self>::new(2, cx, |state, cx| {
let style = &cx
.global::<Settings>()
.theme
.search
.option_button
.style_for(state, false);
let context_menu_item = cx
.global::<Settings>()
.theme
.context_menu
.clone()
.item
.style_for(state, true)
.clone();
Flex::row()
.with_child(
Label::new(
"Open a new project!".to_string(),
context_menu_item.label.clone(),
)
.contained()
.boxed(),
)
.with_child({
KeystrokeLabel::new(
cx.window_id(),
parent_view_id,
Box::new(workspace::Open),
context_menu_item.keystroke.container,
context_menu_item.keystroke.text.clone(),
)
.flex_float()
.boxed()
})
.contained()
.with_style(style.container)
.aligned()
.top()
.constrained()
.with_width(100.)
.with_height(20.)
.boxed()
})
.on_click(MouseButton::Left, move |_, cx| {
cx.dispatch_action(workspace::Open)
})
.with_cursor_style(CursorStyle::PointingHand)
.boxed(),
)
.boxed()
})
// TODO is this nescessary?
.on_click(MouseButton::Left, |_, cx| cx.focus_parent_view())
.boxed(),
)
.boxed()
}
}
fn keymap_context(&self, _: &AppContext) -> KeymapContext {

2
crates/terminal_view/src/terminal_element.rs
View file

@ -720,7 +720,7 @@ impl Element for TerminalElement {
cx.paint_layer(clip_bounds, |cx| {
let origin = bounds.origin() + vec2f(layout.size.cell_width, 0.);
//Elements are ephemeral, only at paint time do we know what could be clicked by a mouse
// Elements are ephemeral, only at paint time do we know what could be clicked by a mouse
self.attach_mouse_handlers(origin, self.view.id(), visible_bounds, layout.mode, cx);
cx.scene.push_cursor_region(gpui::CursorRegion {

12
crates/welcome/src/welcome.rs
View file

@ -2,7 +2,8 @@ use gpui::{
color::Color,
elements::{Canvas, Empty, Flex, Label, MouseEventHandler, ParentElement, Stack, Svg},
geometry::rect::RectF,
Element, ElementBox, Entity, MutableAppContext, RenderContext, Subscription, View, ViewContext,
Element, ElementBox, Entity, MouseRegion, MutableAppContext, RenderContext, Subscription, View,
ViewContext,
};
use settings::{settings_file::SettingsFile, Settings, SettingsFileContent};
use theme::CheckboxStyle;
@ -29,6 +30,7 @@ impl View for WelcomePage {
}
fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> ElementBox {
let self_handle = cx.handle();
let settings = cx.global::<Settings>();
let theme = settings.theme.clone();
@ -44,6 +46,7 @@ impl View for WelcomePage {
Stack::new()
.with_child(
// TODO: Can this be moved into the pane?
Canvas::new(move |bounds, visible_bounds, cx| {
let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
@ -53,7 +56,12 @@ impl View for WelcomePage {
background: Some(background),
..Default::default()
})
})
});
cx.scene.push_mouse_region(
MouseRegion::new::<Self>(self_handle.id(), 0, visible_bounds)
.on_down(gpui::MouseButton::Left, |_, cx| cx.focus_parent_view()),
);
})
.boxed(),
)