From 01f2f40475bd3695535ad81e7da93cfc3b7837c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 12 Nov 2024 16:47:47 +0100 Subject: [PATCH] cursor-renderer: Pass renderer when finding highest scale monitor Do this instead of going via the backend, since we don't need anything other from the backend. Part-of: --- src/backends/meta-cursor-renderer.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c index d4762c1fa..87c9b5577 100644 --- a/src/backends/meta-cursor-renderer.c +++ b/src/backends/meta-cursor-renderer.c @@ -368,19 +368,19 @@ meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer, } static float -find_highest_logical_monitor_scale (MetaBackend *backend, - MetaCursorSprite *cursor_sprite) +find_highest_logical_monitor_scale (MetaCursorRenderer *renderer, + MetaCursorSprite *cursor_sprite) { + MetaCursorRendererPrivate *priv = + meta_cursor_renderer_get_instance_private (renderer); MetaMonitorManager *monitor_manager = - meta_backend_get_monitor_manager (backend); - MetaCursorRenderer *cursor_renderer = - meta_backend_get_cursor_renderer (backend); + meta_backend_get_monitor_manager (priv->backend); graphene_rect_t cursor_rect; GList *logical_monitors; GList *l; float highest_scale = 0.0f; - cursor_rect = meta_cursor_renderer_calculate_rect (cursor_renderer, + cursor_rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite); logical_monitors = @@ -406,11 +406,12 @@ static void meta_cursor_renderer_update_cursor (MetaCursorRenderer *renderer, MetaCursorSprite *cursor_sprite) { - MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); + MetaCursorRendererPrivate *priv = + meta_cursor_renderer_get_instance_private (renderer); if (cursor_sprite) { - float scale = find_highest_logical_monitor_scale (priv->backend, + float scale = find_highest_logical_monitor_scale (renderer, cursor_sprite); meta_cursor_sprite_prepare_at (cursor_sprite, MAX (1, scale),