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

Fix disabled textedit blocking focus shift. (#748)

Browse source 
* Fix disabled textedit blocking focus shift.

Fixes #732. Ui::interact was being called twice for the frame rect
regardless of enabled status which was causing problems for kb focus.
Now the interact function is called zero or one time.

* Apply clippy suggestion

Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>

Co-authored-by: Persson <Simon.Persson@nov.com>
Co-authored-by: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
This commit is contained in:
Simon Persson 2021-10-01 00:54:19 +08:00 committed by GitHub
parent 3e1db880dc
commit 7df2408482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -406,24 +406,26 @@ impl<'t, S: TextBuffer> TextEdit<'t, S> {
impl<'t, S: TextBuffer> Widget for TextEdit<'t, S> {
fn ui(self, ui: &mut Ui) -> Response {
let frame = self.frame;
let enabled = self.enabled;
let where_to_put_background = ui.painter().add(Shape::Noop);
let margin = Vec2::new(4.0, 2.0);
let max_rect = ui.available_rect_before_wrap().shrink2(margin);
let mut content_ui = ui.child_ui(max_rect, *ui.layout());
let response = self.content_ui(&mut content_ui);
let mut response = self.content_ui(&mut content_ui);
let id = response.id;
let frame_rect = response.rect.expand2(margin);
ui.allocate_rect(frame_rect, Sense::hover());
let frame_response = ui.interact(frame_rect, id, Sense::click());
let response = response | frame_response;
ui.allocate_space(frame_rect.size());
if enabled {
response |= ui.interact(frame_rect, id, Sense::click())
}
if response.clicked() && !response.lost_focus() {
ui.memory().request_focus(response.id);
}
if frame {
let visuals = ui.style().interact(&response);
let frame_rect = response.rect.expand(visuals.expansion);
let frame_rect = frame_rect.expand(visuals.expansion);
let shape = if response.has_focus() {
epaint::RectShape {
rect: frame_rect,