Merge lp:~fabiozaramella/screenshot-tool/fix-for-1630612 into lp:~elementary-apps/screenshot-tool/trunk

[Fabio Zaramella]

Fix the dimensions and placement of the mouse cursor for HiDPI displays

This branch should fix the dimensions of the mouse in HiDPI monitors.
Someone test it please.

[lp:~fabiozaramella/screenshot-tool/fix-for-1630612]

272. By Fabio Zaramella on 2017-01-21

fix cursor offset

[Danielle Foré (danrabbit)]

I can confirm that this fixes the issue on HiDPI displays

review: Approve

=== modified file 'src/ScreenshotWindow.vala'
--- src/ScreenshotWindow.vala	2017-01-20 17:55:41 +0000
+++ src/ScreenshotWindow.vala	2017-01-21 20:54:43 +0000
@@ -252,6 +252,8 @@
             }
 
             Gdk.Pixbuf? screenshot;
+            int scale_factor = win.get_scale_factor ();
+
             if (capture_mode == CaptureType.AREA) {
                 Gdk.Rectangle selection_rect;
                 win.get_frame_extents (out selection_rect);
@@ -266,7 +268,6 @@
             } else {
                 int width = win.get_width ();
                 int height = win.get_height ();
-                int scale_factor = win.get_scale_factor ();
 
                 // Check the scaling factor in use, and if greater than 1 scale the image. (for HiDPI displays)
                 if (scale_factor > 1) {
@@ -295,18 +296,27 @@
                     var manager = Gdk.Display.get_default ().get_device_manager ();
                     var device = manager.get_client_pointer ();
 
-                    int cx, cy;
+                    int cx, cy, xhot, yhot;
                     win.get_device_position (device, out cx, out cy, null);
+                    xhot = int.parse (cursor_pixbuf.get_option ("x_hot")); // Left padding in cursor_pixbuf between the margin and the actual pointer
+                    yhot = int.parse (cursor_pixbuf.get_option ("y_hot")); // Top padding in cursor_pixbuf between the margin and the actual pointer
 
                     var cursor_rect = Gdk.Rectangle ();
 
-                    cursor_rect.x = cx + win_rect.x;
-                    cursor_rect.y = cy + win_rect.y;
+                    cursor_rect.x = cx + win_rect.x - xhot;
+                    cursor_rect.y = cy + win_rect.y - yhot;
                     cursor_rect.width = cursor_pixbuf.get_width ();
                     cursor_rect.height = cursor_pixbuf.get_height ();
 
+                    if (scale_factor > 1) {
+                        cursor_rect.x *= scale_factor;
+                        cursor_rect.y *= scale_factor;
+                        cursor_rect.width *= scale_factor;
+                        cursor_rect.height *= scale_factor;
+                    }
+
                     if (win_rect.intersect (cursor_rect, out cursor_rect)) {
-                        cursor_pixbuf.composite (screenshot, cx, cy, cursor_rect.width, cursor_rect.height, cx, cy, 1.0, 1.0, Gdk.InterpType.BILINEAR, 255);
+                        cursor_pixbuf.composite (screenshot, cursor_rect.x, cursor_rect.y, cursor_rect.width, cursor_rect.height, cursor_rect.x, cursor_rect.y, scale_factor, scale_factor, Gdk.InterpType.BILINEAR, 255);
                     }
                 }
             }