brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screenshot: Make captureScreenshot async

Browse Source 
Now that it's split out and has no implicit arguments we can convert it
to be a proper async function.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2105>
This commit is contained in:
Ivan Molodetskikh 2022-02-09 14:31:31 +03:00 committed by Marge Bot
parent 907377ec40
commit b2fd93f3da
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/screenshot.js
View File

@ -1702,7 +1702,7 @@ var ScreenshotUI = GObject.registerClass({
y: this._cursor.y * this._scale, y: this._cursor.y * this._scale,
scale: this._cursorScale, scale: this._cursorScale,
} }
); ).catch(e => logError(e, 'Error capturing screenshot'));
} else if (this._windowButton.checked) { } else if (this._windowButton.checked) {
const window = const window =
this._windowSelectors.flatMap(selector => selector.windows()) this._windowSelectors.flatMap(selector => selector.windows())
@ -1730,7 +1730,7 @@ var ScreenshotUI = GObject.registerClass({
y: window.cursorPoint.y * window.bufferScale, y: window.cursorPoint.y * window.bufferScale,
scale: this._cursorScale, scale: this._cursorScale,
} }
); ).catch(e => logError(e, 'Error capturing screenshot'));
} }
} }
@ -2115,7 +2115,7 @@ function _storeScreenshot(bytes, pixbuf) {
* @param {number} cursor.y - The cursor y coordinate. * @param {number} cursor.y - The cursor y coordinate.
* @param {number} cursor.scale - The cursor texture scale. * @param {number} cursor.scale - The cursor texture scale.
*/ */
function captureScreenshot(texture, geometry, scale, cursor) { async function captureScreenshot(texture, geometry, scale, cursor) {
const stream = Gio.MemoryOutputStream.new_resizable(); const stream = Gio.MemoryOutputStream.new_resizable();
const [x, y, w, h] = geometry ?? [0, 0, -1, -1]; const [x, y, w, h] = geometry ?? [0, 0, -1, -1];
if (cursor === null) if (cursor === null)
@ -2124,18 +2124,16 @@ function captureScreenshot(texture, geometry, scale, cursor) {
global.display.get_sound_player().play_from_theme( global.display.get_sound_player().play_from_theme(
'screen-capture', _('Screenshot taken'), null); 'screen-capture', _('Screenshot taken'), null);
Shell.Screenshot.composite_to_stream( const pixbuf = await Shell.Screenshot.composite_to_stream(
texture, texture,
x, y, w, h, x, y, w, h,
scale, scale,
cursor.texture, cursor.x, cursor.y, cursor.scale, cursor.texture, cursor.x, cursor.y, cursor.scale,
stream stream
).then(pixbuf => { );
stream.close(null);
_storeScreenshot(stream.steal_as_bytes(), pixbuf); stream.close(null);
}).catch(err => { _storeScreenshot(stream.steal_as_bytes(), pixbuf);
logError(err, 'Error capturing screenshot');
});
} }
/** /**