oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Mikayla Maki
2023-03-06 14:26:32 -08:00
parent 62aeb6b8b3
commit 9dee2ca2be
3 changed files with 143 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/project_panel/src/project_panel.rs
+132 -50
View File
@@ -5,9 +5,11 @@ use futures::stream::StreamExt;
use gpui::{ use gpui::{
actions, actions,
anyhow::{anyhow, Result}, anyhow::{anyhow, Result},
color::Color,
elements::{ elements::{
AnchorCorner, ChildView, ConstrainedBox, ContainerStyle, Empty, Flex, Label, AnchorCorner, Canvas, ChildView, ConstrainedBox, ContainerStyle, Empty, Flex,
MouseEventHandler, ParentElement, ScrollTarget, Stack, Svg, UniformList, UniformListState, KeystrokeLabel, Label, MouseEventHandler, ParentElement, ScrollTarget, Stack, Svg,
UniformList, UniformListState,
}, },
geometry::vector::Vector2F, geometry::vector::Vector2F,
impl_internal_actions, impl_internal_actions,
@@ -1262,54 +1264,134 @@ impl View for ProjectPanel {
let padding = std::mem::take(&mut container_style.padding); let padding = std::mem::take(&mut container_style.padding);
let last_worktree_root_id = self.last_worktree_root_id; let last_worktree_root_id = self.last_worktree_root_id;
Stack::new() let has_worktree = self.visible_entries.len() != 0;
.with_child(
MouseEventHandler::<ProjectPanel>::new(0, cx, |_, cx| { if has_worktree {
UniformList::new( Stack::new()
self.list.clone(), .with_child(
self.visible_entries MouseEventHandler::<ProjectPanel>::new(0, cx, |_, cx| {
.iter() UniformList::new(
.map(|(_, worktree_entries)| worktree_entries.len()) self.list.clone(),
.sum(), self.visible_entries
cx, .iter()
move |this, range, items, cx| { .map(|(_, worktree_entries)| worktree_entries.len())
let theme = cx.global::<Settings>().theme.clone(); .sum(),
let mut dragged_entry_destination = cx,
this.dragged_entry_destination.clone(); move |this, range, items, cx| {
this.for_each_visible_entry(range, cx, |id, details, cx| { let theme = cx.global::<Settings>().theme.clone();
items.push(Self::render_entry( let mut dragged_entry_destination =
id, this.dragged_entry_destination.clone();
details, this.for_each_visible_entry(range, cx, |id, details, cx| {
&this.filename_editor, items.push(Self::render_entry(
&mut dragged_entry_destination, id,
&theme.project_panel, details,
cx, &this.filename_editor,
)); &mut dragged_entry_destination,
}); &theme.project_panel,
this.dragged_entry_destination = dragged_entry_destination; cx,
}, ));
) });
.with_padding_top(padding.top) this.dragged_entry_destination = dragged_entry_destination;
.with_padding_bottom(padding.bottom) },
.contained() )
.with_style(container_style) .with_padding_top(padding.top)
.expanded() .with_padding_bottom(padding.bottom)
.boxed() .contained()
}) .with_style(container_style)
.on_down(MouseButton::Right, move |e, cx| { .expanded()
// When deploying the context menu anywhere below the last project entry, .boxed()
// act as if the user clicked the root of the last worktree. })
if let Some(entry_id) = last_worktree_root_id { .on_down(MouseButton::Right, move |e, cx| {
cx.dispatch_action(DeployContextMenu { // When deploying the context menu anywhere below the last project entry,
entry_id, // act as if the user clicked the root of the last worktree.
position: e.position, if let Some(entry_id) = last_worktree_root_id {
}) cx.dispatch_action(DeployContextMenu {
} entry_id,
}) position: e.position,
.boxed(), })
) }
.with_child(ChildView::new(&self.context_menu, cx).boxed()) })
.boxed() .boxed(),
)
.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 { fn keymap_context(&self, _: &AppContext) -> KeymapContext {
crates/terminal_view/src/terminal_element.rs
+1 -1
View File
@@ -720,7 +720,7 @@ impl Element for TerminalElement {
cx.paint_layer(clip_bounds, |cx| { cx.paint_layer(clip_bounds, |cx| {
let origin = bounds.origin() + vec2f(layout.size.cell_width, 0.); 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); self.attach_mouse_handlers(origin, self.view.id(), visible_bounds, layout.mode, cx);
cx.scene.push_cursor_region(gpui::CursorRegion { cx.scene.push_cursor_region(gpui::CursorRegion {
crates/welcome/src/welcome.rs
+10 -2
View File
@@ -2,7 +2,8 @@ use gpui::{
color::Color, color::Color,
elements::{Canvas, Empty, Flex, Label, MouseEventHandler, ParentElement, Stack, Svg}, elements::{Canvas, Empty, Flex, Label, MouseEventHandler, ParentElement, Stack, Svg},
geometry::rect::RectF, 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 settings::{settings_file::SettingsFile, Settings, SettingsFileContent};
use theme::CheckboxStyle; use theme::CheckboxStyle;
@@ -29,6 +30,7 @@ impl View for WelcomePage {
} }
fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> ElementBox { fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> ElementBox {
let self_handle = cx.handle();
let settings = cx.global::<Settings>(); let settings = cx.global::<Settings>();
let theme = settings.theme.clone(); let theme = settings.theme.clone();
@@ -44,6 +46,7 @@ impl View for WelcomePage {
Stack::new() Stack::new()
.with_child( .with_child(
// TODO: Can this be moved into the pane?
Canvas::new(move |bounds, visible_bounds, cx| { Canvas::new(move |bounds, visible_bounds, cx| {
let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default(); let visible_bounds = bounds.intersection(visible_bounds).unwrap_or_default();
@@ -53,7 +56,12 @@ impl View for WelcomePage {
background: Some(background), background: Some(background),
..Default::default() ..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(), .boxed(),
) )