diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2022-03-02 00:25:59 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2022-03-02 00:35:48 +0300 |
commit | bfe37b7255e76b7c66e3f9cfd47bd0636ac142cf (patch) | |
tree | 2bcb56940efd532d7bcd8ac0b3fb67e466f4ffee /source/blender | |
parent | e1ec2d025142a35ce5a5302da0b9a71a279c61f2 (diff) | |
parent | 9bd586a01e6813a615eab05871803730603e2152 (diff) |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/interface/interface_eyedropper.c | 3 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 5 | ||||
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 57 |
5 files changed, 18 insertions, 57 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c index e72381821e8..eaec1e249b7 100644 --- a/source/blender/editors/interface/interface_eyedropper.c +++ b/source/blender/editors/interface/interface_eyedropper.c @@ -147,8 +147,7 @@ void datadropper_win_area_find( *r_win = CTX_wm_window(C); *r_area = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, mval); if (*r_area == NULL) { - wmWindowManager *wm = CTX_wm_manager(C); - *r_win = WM_window_find_under_cursor(wm, NULL, *r_win, mval, r_mval); + *r_win = WM_window_find_under_cursor(*r_win, mval, r_mval); if (*r_win) { screen = WM_window_get_active_screen(*r_win); *r_area = BKE_screen_find_area_xy(screen, SPACE_TYPE_ANY, r_mval); diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index a64948b5864..af84f6f99a9 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -3442,7 +3442,6 @@ ScrArea *ED_area_find_under_cursor(const bContext *C, int spacetype, const int x { bScreen *screen = CTX_wm_screen(C); wmWindow *win = CTX_wm_window(C); - wmWindowManager *wm = CTX_wm_manager(C); ScrArea *area = NULL; @@ -3454,8 +3453,8 @@ ScrArea *ED_area_find_under_cursor(const bContext *C, int spacetype, const int x if (!area) { /* Check all windows except the active one. */ int scr_pos[2]; - wmWindow *r_win = WM_window_find_under_cursor(wm, win, win, xy, scr_pos); - if (r_win) { + wmWindow *r_win = WM_window_find_under_cursor(win, xy, scr_pos); + if (r_win && r_win != win) { win = r_win; screen = WM_window_get_active_screen(win); area = BKE_screen_find_area_xy(screen, spacetype, scr_pos); diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index ef8aed4c664..2c2143f350a 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -127,11 +127,7 @@ void WM_reinit_gizmomap_all(struct Main *bmain); */ void WM_script_tag_reload(void); -wmWindow *WM_window_find_under_cursor(const wmWindowManager *wm, - const wmWindow *win_ignore, - const wmWindow *win, - const int mval[2], - int r_mval[2]); +wmWindow *WM_window_find_under_cursor(wmWindow *win, const int mval[2], int r_mval[2]); void WM_window_pixel_sample_read(const wmWindowManager *wm, const wmWindow *win, const int pos[2], diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index ee07e90f4de..fb5af920ff8 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -4667,8 +4667,8 @@ static wmWindow *wm_event_cursor_other_windows(wmWindowManager *wm, wmWindow *wi } } - wmWindow *win_other = WM_window_find_under_cursor(wm, win, win, mval, mval); - if (win_other) { + wmWindow *win_other = WM_window_find_under_cursor(win, mval, mval); + if (win_other && win_other != win) { copy_v2_v2_int(event->xy, mval); return win_other; } diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 242b8dc2968..e93ffe48aba 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1841,56 +1841,23 @@ bool wm_window_get_swap_interval(wmWindow *win, int *intervalOut) /** \name Find Window Utility * \{ */ -static void wm_window_desktop_pos_get(const wmWindow *win, - const int screen_pos[2], - int r_desk_pos[2]) +wmWindow *WM_window_find_under_cursor(wmWindow *win, const int mval[2], int r_mval[2]) { - /* To desktop space. */ - r_desk_pos[0] = screen_pos[0] + (int)(U.pixelsize * win->posx); - r_desk_pos[1] = screen_pos[1] + (int)(U.pixelsize * win->posy); -} - -static void wm_window_screen_pos_get(const wmWindow *win, - const int desktop_pos[2], - int r_scr_pos[2]) -{ - /* To window space. */ - r_scr_pos[0] = desktop_pos[0] - (int)(U.pixelsize * win->posx); - r_scr_pos[1] = desktop_pos[1] - (int)(U.pixelsize * win->posy); -} - -wmWindow *WM_window_find_under_cursor(const wmWindowManager *wm, - const wmWindow *win_ignore, - const wmWindow *win, - const int mval[2], - int r_mval[2]) -{ - int desk_pos[2]; - wm_window_desktop_pos_get(win, mval, desk_pos); - - /* TODO: This should follow the order of the activated windows. - * The current solution is imperfect but usable in most cases. */ - LISTBASE_FOREACH (wmWindow *, win_iter, &wm->windows) { - if (win_iter == win_ignore) { - continue; - } - - if (win_iter->windowstate == GHOST_kWindowStateMinimized) { - continue; - } - - int scr_pos[2]; - wm_window_screen_pos_get(win_iter, desk_pos, scr_pos); + int tmp[2]; + copy_v2_v2_int(tmp, mval); + wm_cursor_position_to_ghost(win, &tmp[0], &tmp[1]); - if (scr_pos[0] >= 0 && scr_pos[1] >= 0 && scr_pos[0] <= WM_window_pixels_x(win_iter) && - scr_pos[1] <= WM_window_pixels_y(win_iter)) { + GHOST_WindowHandle ghostwin = GHOST_GetWindowUnderCursor(g_system, tmp[0], tmp[1]); - copy_v2_v2_int(r_mval, scr_pos); - return win_iter; - } + if (!ghostwin) { + return NULL; } - return NULL; + wmWindow *r_win = GHOST_GetWindowUserData(ghostwin); + wm_cursor_position_from_ghost(r_win, &tmp[0], &tmp[1]); + copy_v2_v2_int(r_mval, tmp); + + return r_win; } void WM_window_pixel_sample_read(const wmWindowManager *wm, |