elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-24 09:42:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

screenshot: Play shutter sound

Browse Source 
We currently rely on Screenshot to play the shutter sound. This means
that it needs pulseaudio permissions in Flatpak and depending on the app
taking the screenshot you might not get a sound when a screenshot is
taken.

In addition, no sound was played when a screenshot was copied directly
to the clipboard.

Play the shutter sound in Gala to avoid this problems.
This commit is contained in:
José Expósito 2021-06-30 07:48:12 +02:00 committed by Corentin Noël
parent b2269aeb27
commit 866d82ac75
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ScreenshotManager.vala
View File

@ -90,6 +90,10 @@ namespace Gala {
} }
success = yield save_image (image, filename, out filename_used); success = yield save_image (image, filename, out filename_used);
if (success) {
play_shutter_sound ();
}
} }
public async void screenshot_area (int x, int y, int width, int height, bool flash, string filename, out bool success, out string filename_used) throws DBusError, IOError { public async void screenshot_area (int x, int y, int width, int height, bool flash, string filename, out bool success, out string filename_used) throws DBusError, IOError {
@ -109,8 +113,12 @@ namespace Gala {
} }
success = yield save_image (image, filename, out filename_used); success = yield save_image (image, filename, out filename_used);
if (!success)
if (success) {
play_shutter_sound ();
} else {
throw new DBusError.FAILED ("Failed to save image"); throw new DBusError.FAILED ("Failed to save image");
}
} }
public async void screenshot_window (bool include_frame, bool include_cursor, bool flash, string filename, out bool success, out string filename_used) throws DBusError, IOError { public async void screenshot_window (bool include_frame, bool include_cursor, bool flash, string filename, out bool success, out string filename_used) throws DBusError, IOError {
@ -146,6 +154,10 @@ namespace Gala {
} }
success = yield save_image (image, filename, out filename_used); success = yield save_image (image, filename, out filename_used);
if (success) {
play_shutter_sound ();
}
} }
public async void select_area (out int x, out int y, out int width, out int height) throws DBusError, IOError { public async void select_area (out int x, out int y, out int width, out int height) throws DBusError, IOError {
@ -312,6 +324,20 @@ namespace Gala {
return true; return true;
} }
private void play_shutter_sound () {
Canberra.Context context;
Canberra.Proplist props;
Canberra.Context.create (out context);
Canberra.Proplist.create (out props);
props.sets (Canberra.PROP_EVENT_ID, "screen-capture");
props.sets (Canberra.PROP_EVENT_DESCRIPTION, _("Screenshot taken"));
props.sets (Canberra.PROP_CANBERRA_CACHE_CONTROL, "permanent");
context.play_full (0, props, null);
}
Cairo.ImageSurface take_screenshot (int x, int y, int width, int height, bool include_cursor) { Cairo.ImageSurface take_screenshot (int x, int y, int width, int height, bool include_cursor) {
Cairo.ImageSurface image; Cairo.ImageSurface image;
#if HAS_MUTTER338 #if HAS_MUTTER338