Skip to content

fix: context menu z-order on canvas terminals #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
190km merged 3 commits into from
Mar 29, 2026
Merged

fix: context menu z-order on canvas terminals #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b4f433
fix: context menu z-order on canvas terminals
190km Mar 29, 2026
9f3db40
fix: context menu renders above terminals and follows canvas pan/zoom
190km Mar 29, 2026
b944a82
chore: remove accidentally committed worktree refs
190km Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 84 additions & 55 deletions src/terminal/panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ pub struct TerminalPanel {
/// so accumulated movement can escape snap zones naturally.
pub resize_virtual_rect: Option<Rect>,
bell_flash_until: f64,
context_menu_pos: Option<Pos2>,
/// When set, reset terminal modes (ALT_SCREEN, MOUSE_MODE) after this time.
/// Triggered when Ctrl+C is sent while in ALT_SCREEN — the TUI app is likely
/// being killed and won't send cleanup escape sequences.
Expand Down Expand Up @@ -221,6 +222,7 @@ impl TerminalPanel {
drag_virtual_pos: None,
resize_virtual_rect: None,
bell_flash_until: 0.0,
context_menu_pos: None,
pending_mode_reset: None,
}
}
Expand Down Expand Up @@ -249,6 +251,7 @@ impl TerminalPanel {
drag_virtual_pos: None,
resize_virtual_rect: None,
bell_flash_until: 0.0,
context_menu_pos: None,
pending_mode_reset: None,
}
}
Expand Down Expand Up @@ -1229,64 +1232,90 @@ impl TerminalPanel {
}

// Context menu with Copy / Paste / Select All
body_resp.context_menu(|ui| {
let has_sel = self.selection.is_some();
if ui.add_enabled(has_sel, egui::Button::new("Copy")).clicked() {
if let Some(text) = self.selected_text() {
ui.ctx().copy_text(text);
}
ui.close_menu();
}
if ui.button("Paste").clicked() {
if let Some(pty) = &self.pty {
if let Ok(mut clipboard) = arboard::Clipboard::new() {
if let Ok(text) = clipboard.get_text() {
let mode = self.input_mode();
if mode.bracketed_paste {
let mut bytes = Vec::new();
bytes.extend_from_slice(b"\x1b[200~");
bytes.extend_from_slice(text.as_bytes());
bytes.extend_from_slice(b"\x1b[201~");
pty.write(&bytes);
} else {
pty.write(text.as_bytes());
// Rendered at Order::Debug so it appears above terminal content (Order::Tooltip).
let menu_id = ui.id().with("ctx_menu").with(self.id);
if body_resp.secondary_clicked() {
// Store click position in canvas space so the menu moves with pan/zoom
let screen_pos = ui.input(|i| i.pointer.latest_pos());
self.context_menu_pos = screen_pos.map(|p| transform.inverse() * p);
ui.memory_mut(|m| m.toggle_popup(menu_id));
}
if ui.memory(|m| m.is_popup_open(menu_id)) {
// Convert canvas position back to screen space each frame
let menu_pos = self
.context_menu_pos
.map(|p| transform * p)
.unwrap_or(body_resp.rect.center());
let area_resp = egui::Area::new(menu_id)
.order(egui::Order::Debug)
.fixed_pos(menu_pos)
.interactable(true)
.show(ui.ctx(), |ui| {
egui::Frame::menu(ui.style()).show(ui, |ui| {
let has_sel = self.selection.is_some();
if ui.add_enabled(has_sel, egui::Button::new("Copy")).clicked() {
if let Some(text) = self.selected_text() {
ui.ctx().copy_text(text);
}
ui.memory_mut(|m| m.close_popup());
}
}
}
ui.close_menu();
}
if ui.button("Select All").clicked() {
let last_col = (self.last_cols as usize).saturating_sub(1);
let last_row = (self.last_rows as usize).saturating_sub(1);
self.selection = Some((0, 0, last_col, last_row));
self.selection_display_offset =
scrollbar_state.map(|s| s.display_offset).unwrap_or(0);
ui.close_menu();
}
ui.separator();
if ui.button("Clear Scrollback").clicked() {
if let Some(pty) = &self.pty {
pty.write(b"\x1b[3J");
}
ui.close_menu();
}
if ui.button("Reset Terminal").clicked() {
if let Some(pty) = &self.pty {
pty.write(b"\x1bc");
}
ui.close_menu();
}
ui.separator();
if ui.button("Rename").clicked() {
ix.action = Some(PanelAction::Rename);
ui.close_menu();
}
if ui.button("Close").clicked() {
ix.action = Some(PanelAction::Close);
ui.close_menu();
if ui.button("Paste").clicked() {
if let Some(pty) = &self.pty {
if let Ok(mut clipboard) = arboard::Clipboard::new() {
if let Ok(text) = clipboard.get_text() {
let mode = self.input_mode();
if mode.bracketed_paste {
let mut bytes = Vec::new();
bytes.extend_from_slice(b"\x1b[200~");
bytes.extend_from_slice(text.as_bytes());
bytes.extend_from_slice(b"\x1b[201~");
pty.write(&bytes);
} else {
pty.write(text.as_bytes());
}
}
}
}
ui.memory_mut(|m| m.close_popup());
}
if ui.button("Select All").clicked() {
let last_col = (self.last_cols as usize).saturating_sub(1);
let last_row = (self.last_rows as usize).saturating_sub(1);
self.selection = Some((0, 0, last_col, last_row));
self.selection_display_offset =
scrollbar_state.map(|s| s.display_offset).unwrap_or(0);
ui.memory_mut(|m| m.close_popup());
}
ui.separator();
if ui.button("Clear Scrollback").clicked() {
if let Some(pty) = &self.pty {
pty.write(b"\x1b[3J");
}
ui.memory_mut(|m| m.close_popup());
}
if ui.button("Reset Terminal").clicked() {
if let Some(pty) = &self.pty {
pty.write(b"\x1bc");
}
ui.memory_mut(|m| m.close_popup());
}
ui.separator();
if ui.button("Rename").clicked() {
ix.action = Some(PanelAction::Rename);
ui.memory_mut(|m| m.close_popup());
}
if ui.button("Close").clicked() {
ix.action = Some(PanelAction::Close);
ui.memory_mut(|m| m.close_popup());
}
});
});
// Close menu when clicking outside
if area_resp.response.clicked_elsewhere() {
ui.memory_mut(|m| m.close_popup());
self.context_menu_pos = None;
}
});
}

ix
}
Expand Down
Loading