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

fix: focus find on window focus if text box did not have focus

Browse source
This commit is contained in:
Ashley Wulber 2025-10-24 13:58:54 -04:00 • committed by Michael Murphy
parent d7454b8685
commit 73446cdafc
2 changed files with 54 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/text_box.rs
View file

@ -44,6 +44,7 @@ pub struct TextBox<'a, Message> {
padding: Padding,
on_auto_scroll: Option<Box<dyn Fn(Option<f32>) -> Message + 'a>>,
on_changed: Option<Message>,
on_focus: Option<Message>,
click_timing: Duration,
has_context_menu: bool,
on_context_menu: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>,
@ -63,6 +64,7 @@ where
padding: Padding::new(0.0),
on_auto_scroll: None,
on_changed: None,
on_focus: None,
click_timing: Duration::from_millis(500),
has_context_menu: false,
on_context_menu: None,
@ -118,6 +120,11 @@ where
self.line_numbers = true;
self
}
pub fn on_focus(mut self, on_focus: Message) -> Self {
self.on_focus = Some(on_focus);
self
}
}
pub fn text_box<'a, Message>(
@ -948,6 +955,13 @@ where
}
}
if let Some(on_focus) = self.on_focus.as_ref()
&& state.emit_focus
{
state.emit_focus = false;
shell.publish(on_focus.clone());
}
let mut status = Status::Ignored;
match event {
Event::Keyboard(KeyEvent::KeyPressed {
@ -1034,6 +1048,10 @@ where
if let Some(p) = cursor_position.position_in(layout.bounds()) {
state.is_focused = true;
if let Some(on_focus) = self.on_focus.as_ref() {
shell.publish(on_focus.clone());
}
// Handle left click drag
if let Button::Left = button {
let x_logical = p.x - self.padding.left;
@ -1263,6 +1281,7 @@ pub struct State {
dragging: Option<Dragging>,
editor_offset_x: Cell<i32>,
is_focused: bool,
emit_focus: bool,
scale_factor: Cell<f32>,
scrollbar_v_rect: Cell<Rectangle<f32>>,
scrollbar_h_rect: Cell<Option<Rectangle<f32>>>,
@ -1278,6 +1297,7 @@ impl State {
dragging: None,
editor_offset_x: Cell::new(0),
is_focused: false,
emit_focus: false,
scale_factor: Cell::new(1.0),
scrollbar_v_rect: Cell::new(Rectangle::default()),
scrollbar_h_rect: Cell::new(None),
@ -1293,6 +1313,7 @@ impl operation::Focusable for State {
fn focus(&mut self) {
self.is_focused = true;
self.emit_focus = true;
}
fn unfocus(&mut self) {