leyoda/cosmic-terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/pop-os/cosmic-term

Browse source
This commit is contained in:
Jeremy Soller 2024-02-02 09:40:50 -07:00
commit 539f39577f
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 44 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/main.rs
View file

@ -271,7 +271,7 @@ pub enum Message {
TabActivateJump(usize), TabActivateJump(usize),
TabClose(Option<segmented_button::Entity>), TabClose(Option<segmented_button::Entity>),
TabContextAction(segmented_button::Entity, Action), TabContextAction(segmented_button::Entity, Action),
TabContextMenu(segmented_button::Entity, Option<Point>), TabContextMenu(pane_grid::Pane, Option<Point>),
TabNew, TabNew,
TabPrev, TabPrev,
TabNext, TabNext,
@ -367,9 +367,7 @@ impl App {
} }
fn update_focus(&self) -> Command<Message> { fn update_focus(&self) -> Command<Message> {
if self.core.window.show_context { if self.find {
Command::none()
} else if self.find {
widget::text_input::focus(self.find_search_id.clone()) widget::text_input::focus(self.find_search_id.clone())
} else if let Some(terminal_id) = self.terminal_ids.get(&self.pane_model.focus).cloned() { } else if let Some(terminal_id) = self.terminal_ids.get(&self.pane_model.focus).cloned() {
widget::text_input::focus(terminal_id) widget::text_input::focus(terminal_id)
@ -883,6 +881,7 @@ impl Application for App {
} else if self.find { } else if self.find {
// Close find if open // Close find if open
self.find = false; self.find = false;
self.find_search_value.clear();
} }
// Focus correct widget // Focus correct widget
@ -1025,6 +1024,22 @@ impl Application for App {
} }
Message::Find(find) => { Message::Find(find) => {
self.find = find; self.find = find;
if find {
if let Some(tab_model) = self.pane_model.active() {
let entity = tab_model.active();
if let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity) {
let terminal = terminal.lock().unwrap();
let term = terminal.term.lock();
if let Some(text) = term.selection_to_string() {
self.find_search_value = text;
}
}
} else {
log::warn!("Failed to get focused pane");
}
} else {
self.find_search_value.clear();
}
// Focus correct input // Focus correct input
return self.update_focus(); return self.update_focus();
@ -1238,8 +1253,23 @@ impl Application for App {
} }
} }
} }
Message::TabContextMenu(entity, position_opt) => { Message::TabContextMenu(pane, position_opt) => {
if let Some(tab_model) = self.pane_model.active() { // Close any existing context menues
let panes: Vec<_> = self.pane_model.panes.iter().collect();
for (_pane, tab_model) in panes {
let entity = tab_model.active();
match tab_model.data::<Mutex<Terminal>>(entity) {
Some(terminal) => {
let mut terminal = terminal.lock().unwrap();
terminal.context_menu = None;
}
_ => {}
}
}
// Show the context menu on the correct pane / terminal
if let Some(tab_model) = self.pane_model.panes.get(pane) {
let entity = tab_model.active();
match tab_model.data::<Mutex<Terminal>>(entity) { match tab_model.data::<Mutex<Terminal>>(entity) {
Some(terminal) => { Some(terminal) => {
// Update context menu position // Update context menu position
@ -1249,6 +1279,11 @@ impl Application for App {
_ => {} _ => {}
} }
} }
// Shift focus to the pane / terminal
// with the context menu
self.pane_model.focus = pane;
return self.update_title(Some(pane));
} }
Message::TabNew => self.create_and_focus_new_terminal(self.pane_model.focus), Message::TabNew => self.create_and_focus_new_terminal(self.pane_model.focus),
Message::TabNext => { Message::TabNext => {
@ -1475,7 +1510,7 @@ impl Application for App {
match tab_model.data::<Mutex<Terminal>>(entity) { match tab_model.data::<Mutex<Terminal>>(entity) {
Some(terminal) => { Some(terminal) => {
let mut terminal_box = terminal_box(terminal).id(terminal_id).on_context_menu( let mut terminal_box = terminal_box(terminal).id(terminal_id).on_context_menu(
move |position_opt| Message::TabContextMenu(entity, position_opt), move |position_opt| Message::TabContextMenu(pane, position_opt),
); );
if self.config.focus_follow_mouse { if self.config.focus_follow_mouse {
@ -1504,7 +1539,8 @@ impl Application for App {
} }
} }
if self.find { //Only draw find in the currently focused pane
if self.find && pane == self.pane_model.focus {
let find_input = widget::text_input::text_input( let find_input = widget::text_input::text_input(
fl!("find-placeholder"), fl!("find-placeholder"),
&self.find_search_value, &self.find_search_value,