language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-11-02 04:48:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

PopupWindow: Fix escape with the Qt backend

Browse source 
With the Qt backend, the PopupWindow has it's own Window, so we need to
make sure we close the popup on the right Window

Fixes #7332
This commit is contained in:
Olivier Goffart 2025-01-13 18:22:08 +01:00
parent 36381c579b
commit d17d5dd6e4
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/core/window.rs
View file

@ -746,7 +746,18 @@ impl WindowInner {
&& event.text.starts_with(key_codes::Escape)
{
// Closes top most popup on esc key pressed when policy is not no-auto-close
let close_on_escape = if let Some(popup) = self.active_popups.borrow().last() {
// Try to get the parent window in case `self` is the popup itself
let mut adapter = self.window_adapter();
let item_tree = self.component();
let mut a = None;
ItemTreeRc::borrow_pin(&item_tree).as_ref().window_adapter(false, &mut a);
if let Some(a) = a {
adapter = a;
}
let window = WindowInner::from_pub(adapter.window());
let close_on_escape = if let Some(popup) = window.active_popups.borrow().last() {
popup.close_policy == PopupClosePolicy::CloseOnClick
|| popup.close_policy == PopupClosePolicy::CloseOnClickOutside
} else {
@ -754,7 +765,7 @@ impl WindowInner {
};
if close_on_escape {
self.close_top_popup();
window.close_top_popup();
}
}
crate::properties::ChangeTracker::run_change_handlers();