blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Fix #93685: Allow Outliner Drag to Other Windows #105196

Merged
Harley Acheson merged 5 commits from Harley/blender:EdgePanDrag into main 2023-08-17 00:48:40 +02:00
Conversation 5 Commits 5 Files Changed 2 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 888b0dcf6b - Show all commits

1
source/blender/editors/interface/view2d_ops.cc
View File

@ -397,6 +397,7 @@ static int view_edge_pan_modal(bContext *C, wmOperator *op, const wmEvent *event
int r_mval[2];
wmWindow *target_win = WM_window_find_under_cursor(source_win, event->xy, &r_mval[0]);
/* Exit if we release mouse button, hit escape, or enter a different window. */
if (event->val == KM_RELEASE || event->type == EVT_ESCKEY || source_win != target_win) {
vpd->v2d->flag &= ~V2D_IS_NAVIGATING;
MEM_SAFE_FREE(op->customdata);

6
source/blender/windowmanager/intern/wm_dragdrop.cc
View File

@ -246,7 +246,7 @@ void WM_event_start_drag(
void wm_drags_exit(wmWindowManager *wm, wmWindow *win)
{
/* End modal cursor usage on all windows. */
/* Turn off modal cursor for all windows. */
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
WM_cursor_modal_restore(win);
}
@ -255,7 +255,7 @@ void wm_drags_exit(wmWindowManager *wm, wmWindow *win)
int r_mval[2];
wmWindow *target_win = WM_window_find_under_cursor(win, win->eventstate->xy, &r_mval[0]);
if (target_win) {
bScreen *screen = WM_window_get_active_screen(target_win);
const bScreen *screen = WM_window_get_active_screen(target_win);
ED_region_tag_redraw_no_rebuild(screen->active_region);
/* Ensure the correct area cursor is restored. */
@ -429,11 +429,9 @@ static wmDropBox *wm_dropbox_active(bContext *C, wmDrag *drag, const wmEvent *ev
drop = dropbox_active(C, &area->handlers, drag, event);
}
}
if (!drop) {
drop = dropbox_active(C, &win->handlers, drag, event);
}
return drop;
}