Improve popup window/menu handling. #58490
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bruvzg
force-pushed
the
imporve_popup_menu_handling
branch
4 times, most recently
from
5bec7ef
to
1d24d5b
Compare
Closed
Add window FLAG_POPUP and a platform specific routines to control popup auto-hiding and event forwarding.
bruvzg
force-pushed
the
imporve_popup_menu_handling
branch
from
1d24d5b
to
74ff592
Compare
bruvzg
changed the title
|
Tested on Linux X11 with Plasma/KWin, seems to work fine. |
|
Tested on Windows 10 (since bruvzg's screenshot was taken in W11) and it seems to work fine. It also fixes a regression where all context menus wouldn't show up anymore after a tooltip is displayed (not mentioned in #58515). |
akien-mga
approved these changes
Feb 25, 2022
|
Thanks! |
akien-mga
reviewed
Mar 8, 2022
| XGetWindowAttributes(x11_display, wd.x11_window, &xwa); | ||
|
|
||
| ERR_FAIL_COND_MSG(p_window == MAIN_WINDOW_ID, "Main window can't be popup."); | ||
| ERR_FAIL_COND_MSG((xwa.map_state == IsViewable) && (wd.is_popup != p_enabled), "Pupup flag can't changed while window is opened."); |
There was a problem hiding this comment.
There's a typo here in "Pupup" (and other 2 implementations).
Rindbee
reviewed
Mar 22, 2022
| if (wd_window.menu_type && !wd_window.no_focus && wd_window.focused) { | ||
| if (!wd_parent.no_focus) { | ||
| if (!wd_window.no_focus && !wd_window.is_popup && wd_window.focused) { | ||
| if (!wd_parent.no_focus && !wd_window.is_popup) { |
There was a problem hiding this comment.
!wd_window.is_popup appears twice. The second one is likely to be !wd_parent.is_popup.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a dedicated window
FLAG_POPUPand a platform specific routines to control popup menus.Previews:
macOS:
macos.mov
Windows:
2022-02-24.12-56-08.mov
TODO:
Popups other than menu andOptionButtondropdowns are functioning correctly.Fixes #53187, supersede #58461