Merge tag 'upstream/0.25.1'

Upstream version 0.25.1

1 files changed, 14 insertions, 3 deletions

diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala
index f869739..5c0eb98 100644
--- a/src/editing_tools/StraightenTool.vala
+++ b/src/editing_tools/StraightenTool.vala
@@ -114,8 +114,15 @@ public class StraightenTool : EditingTool {
             angle_slider.set_value(0.0);
             angle_slider.set_draw_value(false);
 
-            description_label.set_padding(CONTROL_SPACING, 0);
-            angle_label.set_padding(0, 0);
+            description_label.margin_start = CONTROL_SPACING;
+            description_label.margin_end = CONTROL_SPACING;
+            description_label.margin_top = 0;
+            description_label.margin_bottom = 0;
+
+            angle_label.margin_start = 0;
+            angle_label.margin_end = 0;
+            angle_label.margin_top = 0;
+            angle_label.margin_bottom = 0;
             angle_label.set_size_request(MIN_LABEL_SIZE,-1);
 
             Gtk.Box slider_layout = new Gtk.Box(Gtk.Orientation.HORIZONTAL, CONTROL_SPACING);
@@ -355,7 +362,11 @@ public class StraightenTool : EditingTool {
         prepare_image();
 
         // set crosshair cursor
-        canvas.get_drawing_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.CROSSHAIR));
+        var drawing_window = canvas.get_drawing_window ();
+        var display = drawing_window.get_display ();
+        var cursor = new Gdk.Cursor.for_display (display,
+                                                 Gdk.CursorType.CROSSHAIR);
+        drawing_window.set_cursor (cursor);
 
         window = new StraightenToolWindow(canvas.get_container());
         bind_window_handlers();