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

Fix some pane focus and find related issues

Browse source 
* If a context_page was shown, the focus for the panes didn't work.
  By clicking all panes you could get input in all of them as long as
  the context_page prevented focus updated.
* Find was drawn in all panes, with typed text being entered in all of
  them. Changed this to only show find in the focused pane.
* Also, when I was going find related stuff, I populate the find entry
  with selected text, and clear the find search value on close.
This commit is contained in:
Mattias Eriksson 2024-02-02 15:16:43 +01:00 • committed by Jeremy Soller
parent 4401a7dbef
commit e322fc86f7
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main.rs
View file

@ -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();
@ -1504,7 +1519,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,