From 8a5a365be93fd72dcc1b49a902820ac459f99d84 Mon Sep 17 00:00:00 2001 From: mtkennerly Date: Fri, 11 Nov 2022 20:00:18 +0800 Subject: #1484, #1527: Fix overlay transition --- native/src/user_interface.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs index 341eeb3a..bc74c835 100644 --- a/native/src/user_interface.rs +++ b/native/src/user_interface.rs @@ -255,7 +255,7 @@ where cursor_position }; - self.overlay = Some(layout); + self.overlay = None; (base_cursor, event_statuses) } else { -- cgit From bbd55ff3a9338775cf87f236265369d9eddae4bd Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 14 Nov 2022 00:50:18 +0100 Subject: Invalidate `overlay` layout when `base` layer captures an `Event` --- native/src/user_interface.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/native/src/user_interface.rs b/native/src/user_interface.rs index bc74c835..7c82878c 100644 --- a/native/src/user_interface.rs +++ b/native/src/user_interface.rs @@ -255,7 +255,7 @@ where cursor_position }; - self.overlay = None; + self.overlay = Some(layout); (base_cursor, event_statuses) } else { @@ -285,6 +285,10 @@ where &mut shell, ); + if matches!(event_status, event::Status::Captured) { + self.overlay = None; + } + shell.revalidate_layout(|| { self.base = renderer.layout( &self.root, -- cgit