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

Various fixes.

Browse source 
* Only dispatch `SelectionChanged` if the selection actually changes.
* Fix missing focus events.
This commit is contained in:
Nolan Darilek 2021-05-20 12:26:34 -05:00
parent 4fa1e82129
commit 9fe465cc4a
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
egui/src/widgets/text_edit.rs
View file

@ -449,6 +449,7 @@ impl<'t> TextEdit<'t> {
} }
let mut text_cursor = None; let mut text_cursor = None;
let prev_text_cursor = state.cursorp;
if ui.memory().has_focus(id) && enabled { if ui.memory().has_focus(id) && enabled {
ui.memory().lock_focus(id, lock_focus); ui.memory().lock_focus(id, lock_focus);
@ -660,9 +661,19 @@ impl<'t> TextEdit<'t> {
ui.memory().id_data.insert(id, state); ui.memory().id_data.insert(id, state);
let selection_changed = if let (Some(text_cursor), Some(prev_text_cursor)) =
(text_cursor, prev_text_cursor)
{
text_cursor.primary.ccursor.index != prev_text_cursor.primary.ccursor.index
|| text_cursor.secondary.ccursor.index != prev_text_cursor.secondary.ccursor.index
} else {
false
};
if response.changed { if response.changed {
response.widget_info(|| WidgetInfo::text_edit(&*prev_text, &*text)); response.widget_info(|| WidgetInfo::text_edit(&*prev_text, &*text));
} else if let Some(text_cursor) = text_cursor { } else if selection_changed {
let text_cursor = text_cursor.unwrap();
let char_range = let char_range =
text_cursor.primary.ccursor.index..=text_cursor.secondary.ccursor.index; text_cursor.primary.ccursor.index..=text_cursor.secondary.ccursor.index;
let info = WidgetInfo::text_selection_changed(char_range, &*text); let info = WidgetInfo::text_selection_changed(char_range, &*text);
@ -671,6 +682,8 @@ impl<'t> TextEdit<'t> {
.output() .output()
.events .events
.push(OutputEvent::TextSelectionChanged(info)); .push(OutputEvent::TextSelectionChanged(info));
} else {
response.widget_info(|| WidgetInfo::text_edit(&*prev_text, &*text));
} }
response response
} }