blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

GHOST/Wayland: resolve glitch drawing the software cursor 

When grab was disabled, the software cursor would remain displayed
in the image view. Ensure an additional redraw is done to clear the
cursor.
This commit is contained in:
Campbell Barton 2022-06-15 15:44:16 +10:00
parent 2770010224
commit 4acbb84efa
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/windowmanager/intern/wm_draw.c
View File

@ -1153,9 +1153,17 @@ static bool wm_draw_update_test_window(Main *bmain, bContext *C, wmWindow *win)
if (wm_software_cursor_needed()) {
struct GrabState grab_state;
if (wm_software_cursor_needed_for_window(win, &grab_state) &&
wm_software_cursor_motion_test(win)) {
return true;
if (wm_software_cursor_needed_for_window(win, &grab_state)) {
if (wm_software_cursor_motion_test(win)) {
return true;
}
}
else {
/* Detect the edge case when the previous draw used the software cursor but this one doesn't,
* it's important to redraw otherwise the software cursor will remain displayed. */
if (g_software_cursor.winid != -1) {
return true;
}
}
}