Skip to content

Commit f48e244

Browse files
authored
Merge branch 'main' into lenemter/remove-desrtoy-effect-for-menus
2 parents 53c9aa4 + 48dd42c commit f48e244

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

data/gala.metainfo.xml.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<issue url="https://github.com/elementary/gala/issues/544">Multitasking View. Wingpanel shows for brief moment if a fullscreen wokspace is selected after coming from a wokspace that shows the wingpanel.</issue>
4444
<issue url="https://github.com/elementary/gala/issues/823">Check for redacted font</issue>
4545
<issue url="https://github.com/elementary/gala/issues/898">Super+Number. When workspace doesn't exist, switch to last workspace instead.</issue>
46+
<issue url="https://github.com/elementary/gala/issues/1121">Postman app is captured partially (and without a shadow)</issue>
4647
<issue url="https://github.com/elementary/gala/issues/1202">Touchpad desktop switching gesture is sometimes unresponsive</issue>
4748
<issue url="https://github.com/elementary/gala/issues/1235">Overview window title should follow keyboard focus</issue>
4849
<issue url="https://github.com/elementary/gala/issues/1661">Better post-screenshot animation</issue>

src/ScreenshotManager.vala

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,19 @@ public class Gala.ScreenshotManager : Object {
7878
wm.launch_action (ActionKeys.INTERACTIVE_SCREENSHOT_ACTION);
7979
break;
8080
case "area-screenshot":
81-
handle_screenshot_area_shortcut.begin (false);
81+
handle_screenshot_area_shortcut.begin (false);
8282
break;
8383
case "window-screenshot":
84-
handle_screenshot_current_window_shortcut.begin (false);
84+
handle_screenshot_current_window_shortcut.begin (false);
8585
break;
8686
case "screenshot-clip":
8787
handle_screenshot_screen_shortcut.begin (true);
8888
break;
8989
case "area-screenshot-clip":
90-
handle_screenshot_area_shortcut.begin (true);
90+
handle_screenshot_area_shortcut.begin (true);
9191
break;
9292
case "window-screenshot-clip":
93-
handle_screenshot_current_window_shortcut.begin (true);
93+
handle_screenshot_current_window_shortcut.begin (true);
9494
break;
9595
}
9696
}
@@ -280,15 +280,12 @@ public class Gala.ScreenshotManager : Object {
280280

281281
var window_actor = (Meta.WindowActor) window.get_compositor_private ();
282282

283-
float actor_x, actor_y;
284-
window_actor.get_position (out actor_x, out actor_y);
285-
286-
var rect = window.get_frame_rect ();
283+
var rect = window.get_buffer_rect ();
287284
if (!include_frame) {
288-
rect = window.frame_rect_to_client_rect (rect);
285+
rect = window.get_frame_rect ();
289286
}
290287

291-
Mtk.Rectangle clip = { rect.x - (int) actor_x, rect.y - (int) actor_y, rect.width, rect.height };
288+
Mtk.Rectangle clip = { rect.x - (int) window_actor.x, rect.y - (int) window_actor.y, rect.width, rect.height };
292289
var image = (Cairo.ImageSurface) window_actor.get_image (clip);
293290
if (include_cursor) {
294291
if (window.get_client_type () == Meta.WindowClientType.WAYLAND) {

0 commit comments

Comments
 (0)