Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add basic context menu element

Browse source
This commit is contained in:
Kirill Bulatov 2023-11-16 14:32:37 +02:00
parent 0f0b7090b8
commit f638d4ce1d
9 changed files with 633 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/terminal_view2/Cargo.toml
View file

@ -9,7 +9,7 @@ path = "src/terminal_view.rs"
doctest = false
[dependencies]
# context_menu = { package = "context_menu2", path = "../context_menu2" }
context_menu = { package = "context_menu2", path = "../context_menu2" }
editor = { package = "editor2", path = "../editor2" }
language = { package = "language2", path = "../language2" }
gpui = { package = "gpui2", path = "../gpui2" }

3
crates/terminal_view2/src/terminal_element.rs
View file

@ -23,6 +23,7 @@
// TerminalSize,
// };
// use theme::ThemeSettings;
// use workspace::ElementId;
// use std::mem;
// use std::{fmt::Debug, ops::RangeInclusive};
@ -809,7 +810,7 @@
// });
// }
// fn element_id(&self) -> Option<workspace::ui::prelude::ElementId> {
// fn element_id(&self) -> Option<ElementId> {
// todo!()
// }

67
crates/terminal_view2/src/terminal_view.rs
View file

@ -7,27 +7,18 @@ pub mod terminal_panel;
// todo!()
// use crate::terminal_element::TerminalElement;
use anyhow::Context;
use dirs::home_dir;
use context_menu::{ContextMenu, ContextMenuItem};
use editor::{scroll::autoscroll::Autoscroll, Editor};
use gpui::{
actions, div, img, red, register_action, AnyElement, AppContext, Component, DispatchPhase, Div,
EventEmitter, FocusEvent, FocusHandle, Focusable, FocusableComponent, FocusableView,
InputHandler, InteractiveComponent, KeyDownEvent, Keystroke, Model, ParentComponent, Pixels,
Render, SharedString, Styled, Task, View, ViewContext, VisualContext, WeakView,
actions, div, img, red, register_action, AnchorCorner, AnyElement, AppContext, Component,
DispatchPhase, Div, EventEmitter, FocusEvent, FocusHandle, Focusable, FocusableComponent,
FocusableView, InputHandler, InteractiveComponent, KeyDownEvent, Keystroke, Model,
ParentComponent, Pixels, Render, SharedString, Styled, Task, View, ViewContext, VisualContext,
WeakView,
};
use language::Bias;
use persistence::TERMINAL_DB;
use project::{search::SearchQuery, LocalWorktree, Project};
use serde::Deserialize;
use settings::Settings;
use smol::Timer;
use std::{
ops::RangeInclusive,
path::{Path, PathBuf},
sync::Arc,
time::Duration,
};
use terminal::{
alacritty_terminal::{
index::Point,
@ -42,7 +33,20 @@ use workspace::{
notifications::NotifyResultExt,
register_deserializable_item,
searchable::{SearchEvent, SearchOptions, SearchableItem},
NewCenterTerminal, Pane, ToolbarItemLocation, Workspace, WorkspaceId,
CloseActiveItem, NewCenterTerminal, Pane, ToolbarItemLocation, Workspace, WorkspaceId,
};
use anyhow::Context;
use dirs::home_dir;
use serde::Deserialize;
use settings::Settings;
use smol::Timer;
use std::{
ops::RangeInclusive,
path::{Path, PathBuf},
sync::Arc,
time::Duration,
};
const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
@ -82,7 +86,7 @@ pub struct TerminalView {
has_new_content: bool,
//Currently using iTerm bell, show bell emoji in tab until input is received
has_bell: bool,
// context_menu: View<ContextMenu>,
context_menu: View<ContextMenu>,
blink_state: bool,
blinking_on: bool,
blinking_paused: bool,
@ -265,8 +269,7 @@ impl TerminalView {
has_new_content: true,
has_bell: false,
focus_handle: cx.focus_handle(),
// todo!()
// context_menu: cx.build_view(|cx| ContextMenu::new(view_id, cx)),
context_menu: cx.build_view(|cx| ContextMenu::new(view_id, cx)),
blink_state: true,
blinking_on: false,
blinking_paused: false,
@ -293,18 +296,21 @@ impl TerminalView {
cx.emit(Event::Wakeup);
}
pub fn deploy_context_menu(&mut self, _position: Point<Pixels>, _cx: &mut ViewContext<Self>) {
//todo!(context_menu)
// let menu_entries = vec![
// ContextMenuItem::action("Clear", Clear),
// ContextMenuItem::action("Close", pane::CloseActiveItem { save_intent: None }),
// ];
pub fn deploy_context_menu(
&mut self,
position: gpui::Point<Pixels>,
cx: &mut ViewContext<Self>,
) {
let menu_entries = vec![
ContextMenuItem::action("Clear", Clear),
ContextMenuItem::action("Close", CloseActiveItem { save_intent: None }),
];
// self.context_menu.update(cx, |menu, cx| {
// menu.show(position, AnchorCorner::TopLeft, menu_entries, cx)
// });
self.context_menu.update(cx, |menu, cx| {
menu.show(position, AnchorCorner::TopLeft, menu_entries, cx)
});
// cx.notify();
cx.notify();
}
fn show_character_palette(&mut self, _: &ShowCharacterPalette, cx: &mut ViewContext<Self>) {
@ -561,8 +567,7 @@ impl Render for TerminalView {
// self.can_navigate_to_selected_word,
// )
)
// todo!()
// .child(ChildView::new(&self.context_menu, cx))
.child(self.context_menu.clone())
}
}