Merge branch 'feature/upstream' into develop

1 files changed, 11 insertions, 1 deletions

diff --git a/src/Application.vala b/src/Application.vala
index 36acc41..59bae36 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -69,6 +69,16 @@ public class Application {
         system_app.startup.connect(on_activated);
     }
 
+    public static double get_scale() {
+        var instance = get_instance().system_app;
+        unowned GLib.List<Gtk.Window> windows = instance.get_windows();
+
+        if (windows == null)
+            return 1.0;
+
+        return windows.data.get_scale_factor();
+    }
+
     /**
      * @brief This is a helper for library mode that should only be
      * called if we've gotten a camera mount and are _not_ the primary
@@ -104,7 +114,7 @@ public class Application {
     }
 
     /**
-     * @brief Signal handler for GApplication's 'command-line' signal.
+     * @brief Signal handler for GApplication's 'activate' signal.
      *
      * The most likely scenario for this to be fired is if the user
      * either tried to run us twice in library mode, or we've just gotten