diff options
Diffstat (limited to 'src/backends/meta-cursor-tracker.c')
| -rw-r--r-- | src/backends/meta-cursor-tracker.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c index ac2d96542..6005e5965 100644 --- a/src/backends/meta-cursor-tracker.c +++ b/src/backends/meta-cursor-tracker.c @@ -63,11 +63,11 @@ get_displayed_cursor (MetaCursorTracker *tracker) if (!tracker->is_showing) return NULL; - if (tracker->grab_cursor) - return tracker->grab_cursor; - - if (tracker->has_window_cursor) - return tracker->window_cursor; + if (tracker->screen->display->grab_op == META_GRAB_OP_NONE) + { + if (tracker->has_window_cursor) + return tracker->window_cursor; + } return tracker->root_cursor; } @@ -375,17 +375,6 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker, } void -meta_cursor_tracker_set_grab_cursor (MetaCursorTracker *tracker, - MetaCursorReference *cursor) -{ - g_clear_pointer (&tracker->grab_cursor, meta_cursor_reference_unref); - if (cursor) - tracker->grab_cursor = meta_cursor_reference_ref (cursor); - - sync_cursor (tracker); -} - -void meta_cursor_tracker_set_window_cursor (MetaCursorTracker *tracker, MetaCursorReference *cursor) { |