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

On touch screens, prioritize drag-to-scroll over drag-to-select text

Browse source 
On mobile, click first, then edit the text.
Otherwise a lot of areas become difficult to scroll on mobile.
This commit is contained in:
Emil Ernerfeldt 2021-10-24 15:19:53 +02:00
parent 17f0ae22c9
commit 9a9b1b8746
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -591,8 +591,18 @@ impl<'t> TextEdit<'t> {
}); });
let mut state = ui.memory().id_data.get_or_default::<State>(id).clone(); let mut state = ui.memory().id_data.get_or_default::<State>(id).clone();
// On touch screens (e.g. mobile in egui_web), should
// dragging select text, or scroll the enclosing `ScrollArea` (if any)?
// Since currently copying selected text in not supported on `egui_web`,
// we prioritize touch-scrolling:
let allow_drag_to_select = !ui.input().any_touches() || ui.memory().has_focus(id);
let sense = if interactive { let sense = if interactive {
if allow_drag_to_select {
Sense::click_and_drag() Sense::click_and_drag()
} else {
Sense::click()
}
} else { } else {
Sense::hover() Sense::hover()
}; };
@ -630,7 +640,8 @@ impl<'t> TextEdit<'t> {
primary: galley.from_ccursor(ccursorp.primary), primary: galley.from_ccursor(ccursorp.primary),
secondary: galley.from_ccursor(ccursorp.secondary), secondary: galley.from_ccursor(ccursorp.secondary),
}); });
} else if response.hovered() && ui.input().pointer.any_pressed() { } else if allow_drag_to_select {
if response.hovered() && ui.input().pointer.any_pressed() {
ui.memory().request_focus(id); ui.memory().request_focus(id);
if ui.input().modifiers.shift { if ui.input().modifiers.shift {
if let Some(cursorp) = &mut state.cursorp { if let Some(cursorp) = &mut state.cursorp {
@ -641,13 +652,16 @@ impl<'t> TextEdit<'t> {
} else { } else {
state.cursorp = Some(CursorPair::one(cursor_at_pointer)); state.cursorp = Some(CursorPair::one(cursor_at_pointer));
} }
} else if ui.input().pointer.any_down() && response.is_pointer_button_down_on() { } else if ui.input().pointer.any_down() && response.is_pointer_button_down_on()
{
// drag to select text:
if let Some(cursorp) = &mut state.cursorp { if let Some(cursorp) = &mut state.cursorp {
cursorp.primary = cursor_at_pointer; cursorp.primary = cursor_at_pointer;
} }
} }
} }
} }
}
if response.hovered() && interactive { if response.hovered() && interactive {
ui.output().cursor_icon = CursorIcon::Text; ui.output().cursor_icon = CursorIcon::Text;