From 237c3e958db16bb4aa2aa575085e2e249cdee67e Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Sat, 18 Mar 2023 21:45:41 -0700 Subject: [PATCH] screenshot: Get cursor texture from window When a window is in the background and should not have the cursor on top of it, its _cursor will be null. By getting the texture through it, we add this extra check, which was missing before, leading to a cursor drawn at 0, 0 on windows where it should not have been drawn. Part-of: --- js/ui/screenshot.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js index 59c63c71e..ecbe50bcc 100644 --- a/js/ui/screenshot.js +++ b/js/ui/screenshot.js @@ -917,6 +917,10 @@ class UIWindowSelectorWindow extends St.Button { this.insert_child_below(this._cursor, this._border); } + getCursorTexture() { + return this._cursor?.content; + } + setCursorVisible(visible) { if (!this._cursor) return; @@ -1812,7 +1816,7 @@ var ScreenshotUI = GObject.registerClass({ const texture = content.get_texture(); - let cursorTexture = this._cursor.content?.get_texture(); + let cursorTexture = window.getCursorTexture()?.get_texture(); if (!this._cursor.visible) cursorTexture = null;