me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dont blink input cursor when window loses focus

Browse source
This commit is contained in:
Cory Forsstrom 2023-07-13 12:10:10 -07:00
parent dc0ebdc525
commit 66d6710663
No known key found for this signature in database
GPG key ID: 64D6B5851FFCAC9E
1 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

39
widget/src/text_input.rs
View file

@ -564,6 +564,7 @@ where
Some(Focus { Some(Focus {
updated_at: now, updated_at: now,
now, now,
is_window_focused: true,
}) })
}) })
} else { } else {
@ -919,19 +920,35 @@ where
state.keyboard_modifiers = modifiers; state.keyboard_modifiers = modifiers;
} }
Event::Window(window::Event::Unfocused) => {
let state = state();
if let Some(focus) = &mut state.is_focused {
focus.is_window_focused = false;
}
}
Event::Window(window::Event::Focused) => {
let state = state();
if let Some(focus) = &mut state.is_focused {
focus.is_window_focused = true;
}
}
Event::Window(window::Event::RedrawRequested(now)) => { Event::Window(window::Event::RedrawRequested(now)) => {
let state = state(); let state = state();
if let Some(focus) = &mut state.is_focused { if let Some(focus) = &mut state.is_focused {
focus.now = now; if focus.is_window_focused {
focus.now = now;
let millis_until_redraw = CURSOR_BLINK_INTERVAL_MILLIS let millis_until_redraw = CURSOR_BLINK_INTERVAL_MILLIS
- (now - focus.updated_at).as_millis() - (now - focus.updated_at).as_millis()
% CURSOR_BLINK_INTERVAL_MILLIS; % CURSOR_BLINK_INTERVAL_MILLIS;
shell.request_redraw(window::RedrawRequest::At( shell.request_redraw(window::RedrawRequest::At(
now + Duration::from_millis(millis_until_redraw as u64), now + Duration::from_millis(millis_until_redraw as u64),
)); ));
}
} }
} }
_ => {} _ => {}
@ -1016,7 +1033,11 @@ pub fn draw<Renderer>(
let font = font.unwrap_or_else(|| renderer.default_font()); let font = font.unwrap_or_else(|| renderer.default_font());
let size = size.unwrap_or_else(|| renderer.default_size()); let size = size.unwrap_or_else(|| renderer.default_size());
let (cursor, offset) = if let Some(focus) = &state.is_focused { let (cursor, offset) = if let Some(focus) = state
.is_focused
.as_ref()
.filter(|focus| focus.is_window_focused)
{
match state.cursor.state(value) { match state.cursor.state(value) {
cursor::State::Index(position) => { cursor::State::Index(position) => {
let (text_value_width, offset) = let (text_value_width, offset) =
@ -1188,6 +1209,7 @@ pub struct State {
struct Focus { struct Focus {
updated_at: Instant, updated_at: Instant,
now: Instant, now: Instant,
is_window_focused: bool,
} }
impl State { impl State {
@ -1225,6 +1247,7 @@ impl State {
self.is_focused = Some(Focus { self.is_focused = Some(Focus {
updated_at: now, updated_at: now,
now, now,
is_window_focused: true,
}); });
self.move_cursor_to_end(); self.move_cursor_to_end();