[gnome-games/wip/exalm/build: 1/2] Revert "Revert "Revert "gamepad-view: Stop accessing Rsvg.Handle fields"""



commit ecb004b2f5220aa73e2c4327047516e8d2327079
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Wed Apr 17 15:08:45 2019 +0500

    Revert "Revert "Revert "gamepad-view: Stop accessing Rsvg.Handle fields"""
    
    Ok, seems using 3.32 sdk is causing problems for nightlies, let's live with
    deprecated warnings for now.
    
    This reverts commit 33c2a0103f10fb9e8c34297503922cfcbec0e697.

 src/ui/gamepad-view.vala | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/src/ui/gamepad-view.vala b/src/ui/gamepad-view.vala
index 86494130..f917f785 100644
--- a/src/ui/gamepad-view.vala
+++ b/src/ui/gamepad-view.vala
@@ -26,11 +26,7 @@ private class Games.GamepadView : Gtk.DrawingArea {
                                critical ("Could not set up gamepad view: %s", e.message);
                        }
 
-                       Rsvg.Rectangle rect = {};
-                       if (!handle.get_geometry_sub (null, out rect, null))
-                               assert_not_reached ();
-
-                       set_size_request ((int) rect.width, (int) rect.height);
+                       set_size_request (handle.width, handle.height);
                        input_highlights = new bool[value.input_paths.length];
 
                        reset ();
@@ -105,13 +101,9 @@ private class Games.GamepadView : Gtk.DrawingArea {
                double w = get_allocated_width ();
                double h = get_allocated_height ();
 
-               Rsvg.Rectangle rect = {};
-               if (!handle.get_geometry_sub (null, out rect, null))
-                       assert_not_reached ();
-
-               scale = double.min (h / rect.height, w / rect.width);
+               scale = double.min (h / handle.height, w / handle.width);
 
-               x = (w - rect.width * scale) / 2;
-               y = (h - rect.height * scale) / 2;
+               x = (w - handle.width * scale) / 2;
+               y = (h - handle.height * scale) / 2;
        }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]