blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

UI: Improved Default GetWindowUnderCursor Behavior #111489

Merged
Harley Acheson merged 3 commits from Harley/blender:DefaultGetWindowUnderCursor into main 2024-01-15 20:27:56 +01:00
Conversation 2 Commits 3 Files Changed 1 +16 -5
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
intern/ghost/intern/GHOST_System.cc
View File

@ -204,16 +204,27 @@ bool GHOST_System::getFullScreen()
GHOST_IWindow *GHOST_System::getWindowUnderCursor(int32_t x, int32_t y)
{
/* TODO: This solution should follow the order of the activated windows (Z-order).
* It is imperfect but usable in most cases. */
for (GHOST_IWindow *iwindow : m_windowManager->getWindows()) {
if (iwindow->getState() == GHOST_kWindowStateMinimized) {
* It is imperfect but usable in most cases. Ideally each platform should provide
* a custom version of this function that properly considers z-order. */
std::vector<GHOST_IWindow *> windows = m_windowManager->getWindows();
std::vector<GHOST_IWindow *>::reverse_iterator iwindow_iter;
/* Search through the windows in reverse order because in most cases
* the window that is on top was created after those that are below it. */
for (iwindow_iter = windows.rbegin(); iwindow_iter != windows.rend(); ++iwindow_iter) {
GHOST_IWindow *win = *iwindow_iter;
if (win->getState() == GHOST_kWindowStateMinimized) {
continue;
}
Harley marked this conversation as resolved Outdated
Campbell Barton commented 2024-01-15 03:22:20 +01:00
Outdated
Review
Copy Link

*picky* prefer to call the iterator iwindow_iter and assign a variable to iwindow since referencing (*iwindow) is awkward.

\*picky\* prefer to call the iterator `iwindow_iter` and assign a variable to `iwindow` since referencing `(*iwindow)` is awkward.
GHOST_Rect bounds;
iwindow->getClientBounds(bounds);
win->getClientBounds(bounds);
if (bounds.isInside(x, y)) {
return iwindow;
return win;
}
}