djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix drag_value.edit_string unexpected reset (#2421)

Browse source 
* Fix drag_value.edit_string unexpected reset

  solve issue #2418 #2370

* Also reset drag_value.edit_string on click

* Fix for clippy check
This commit is contained in:
bilabila 2022-12-10 17:05:51 +08:00 committed by GitHub
parent aca3807e43
commit e7471f1191
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/egui/src/widgets/drag_value.rs
View file

@ -379,6 +379,9 @@ impl<'a> Widget for DragValue<'a> {
// screen readers. // screen readers.
ui.memory().interested_in_focus(id); ui.memory().interested_in_focus(id);
let is_kb_editing = ui.memory().has_focus(id); let is_kb_editing = ui.memory().has_focus(id);
if ui.memory().gained_focus(id) {
ui.memory().drag_value.edit_string = None;
}
let old_value = get(&mut get_set_value); let old_value = get(&mut get_set_value);
let mut value = old_value; let mut value = old_value;
@ -476,7 +479,6 @@ impl<'a> Widget for DragValue<'a> {
ui.memory().drag_value.edit_string = Some(value_text); ui.memory().drag_value.edit_string = Some(value_text);
response response
} else { } else {
ui.memory().drag_value.edit_string = None;
let button = Button::new( let button = Button::new(
RichText::new(format!("{}{}{}", prefix, value_text.clone(), suffix)).monospace(), RichText::new(format!("{}{}{}", prefix, value_text.clone(), suffix)).monospace(),
) )
@ -497,6 +499,7 @@ impl<'a> Widget for DragValue<'a> {
} }
if response.clicked() { if response.clicked() {
ui.memory().drag_value.edit_string = None;
ui.memory().request_focus(id); ui.memory().request_focus(id);
} else if response.dragged() { } else if response.dragged() {
ui.output().cursor_icon = CursorIcon::ResizeHorizontal; ui.output().cursor_icon = CursorIcon::ResizeHorizontal;