chore: use builtin context menu

Author: iamazy

crates/egui-term/src/display/mod.rs

@@ -11,8 +11,8 @@ use alacritty_terminal::vte::ansi::{Color, NamedColor};
 use copypasta::ClipboardProvider;
 use egui::epaint::RectShape;
 use egui::{
-    Align2, Area, Button, Color32, CornerRadius, CursorIcon, Id, Key, KeyboardShortcut, Modifiers,
-    Painter, Pos2, Rect, Response, Vec2, WidgetText,
+    Align2, Button, CornerRadius, CursorIcon, Key, KeyboardShortcut, Modifiers, Painter, Pos2,
+    Rect, Response, Vec2, WidgetText,
 };
 use egui::{Shape, Stroke};
 
@@ -148,24 +148,19 @@ impl TerminalView<'_> {
 }
 
 impl TerminalView<'_> {
-    pub fn context_menu(&mut self, pos: Pos2, layout: &Response, ui: &mut egui::Ui) {
-        Area::new(Id::new(format!("context_menu_{:?}", self.id())))
-            .fixed_pos(pos)
-            .order(egui::Order::Foreground)
-            .show(ui.ctx(), |ui| {
-                egui::Frame::popup(ui.style()).show(ui, |ui| {
-                    let width = 200.;
-                    ui.set_width(width);
-                    // copy btn
-                    self.copy_btn(ui, layout, width);
-                    // paste btn
-                    self.paste_btn(ui, width);
-
-                    ui.separator();
-                    // select all btn
-                    self.select_all_btn(ui, width);
-                });
-            });
+    pub fn context_menu(&mut self, layout: &Response) {
+        layout.context_menu(|ui| {
+            let width = 200.;
+            ui.set_width(width);
+            // copy btn
+            self.copy_btn(ui, layout, width);
+            // paste btn
+            self.paste_btn(ui, width);
+
+            ui.separator();
+            // select all btn
+            self.select_all_btn(ui, width);
+        });
     }
 
     fn copy_btn(&mut self, ui: &mut egui::Ui, layout: &Response, btn_width: f32) {
@@ -217,9 +212,7 @@ fn context_btn<'a>(
     width: f32,
     shortcut: Option<String>,
 ) -> Button<'a> {
-    let mut btn = Button::new(text)
-        .fill(Color32::TRANSPARENT)
-        .min_size((width, 0.).into());
+    let mut btn = Button::new(text).min_size((width, 0.).into());
     if let Some(shortcut) = shortcut {
         btn = btn.shortcut_text(shortcut);
     }

crates/egui-term/src/input/mod.rs

@@ -133,10 +133,6 @@ impl TerminalView<'_> {
             PointerButton::Primary => {
                 self.left_button_click(state, layout, position, modifiers, pressed)
             }
-            PointerButton::Secondary => {
-                state.context_menu_position = Some(position);
-                None
-            }
             _ => None,
         }
     }
@@ -149,9 +145,6 @@ impl TerminalView<'_> {
         modifiers: &Modifiers,
         pressed: bool,
     ) -> Option<InputAction> {
-        if state.context_menu_position.is_some() {
-            return None;
-        }
         let terminal_mode = self.term_ctx.terminal.mode();
         if terminal_mode.intersects(TermMode::MOUSE_MODE) {
             Some(InputAction::BackendCall(BackendCommand::MouseReport(

crates/egui-term/src/view.rs

@@ -23,7 +23,6 @@ pub struct TerminalViewState {
     // for terminal
     pub mouse_point: Point,
     pub mouse_position: Option<Pos2>,
-    pub context_menu_position: Option<Pos2>,
     pub cursor_position: Option<Pos2>,
     pub scrollbar_state: ScrollbarState,
 }
@@ -79,17 +78,7 @@ impl Widget for TerminalView<'_> {
                 self.has_focus = false;
             }
 
-            // context menu
-            if let Some(pos) = state.context_menu_position {
-                if is_in_terminal(pos, layout.rect) {
-                    self.context_menu(pos, &layout, ui);
-                }
-            }
-
-            if ui.input(|input_state| input_state.pointer.primary_clicked()) {
-                state.context_menu_position = None;
-                ui.close();
-            }
+            self.context_menu(&layout);
 
             let background = self.theme().get_color(Color::Named(NamedColor::Background));