Use convenience functions to obtain monitor geometry

2 files changed, 9 insertions, 47 deletions

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index 3d949a8c9..f7e9a1bed 100644
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -20,13 +20,10 @@
 #include "dialog-manager.h"
 #include <gtkmm/dialog.h>
 
-#if GTKMM_CHECK_VERSION(3,22,0)
-# include <gdkmm/monitor.h>
-#endif
-
 #include <gdk/gdkkeysyms.h>
 
 #include "inkscape.h"
+#include "ui/monitor.h"
 #include "ui/tools/tool-base.h"
 #include "desktop.h"
 
@@ -166,26 +163,9 @@ void Dialog::read_geometry()
         resize(w, h);
     }
 
-#if GTKMM_CHECK_VERSION(3,22,0)
-    auto const display = Gdk::Display::get_default();
-    auto monitor = display->get_primary_monitor();
-
-    // If user hasn't configured a primary monitor, nullptr is returned so try first monitor.
-    if (!monitor) {
-        std::cerr << "Dialog::read_geometry: no primary monitor configured!" << std::endl;
-        monitor = display->get_monitor(0);
-    }
-
-    Gdk::Rectangle screen_geometry;
-    if (monitor) {
-        monitor->get_geometry(screen_geometry);
-    }
-    auto const screen_width  = screen_geometry.get_width();
-    auto const screen_height = screen_geometry.get_height();
-#else
-    auto const screen_width  = gdk_screen_width();
-    auto const screen_height = gdk_screen_height();
-#endif
+    Gdk::Rectangle monitor_geometry = Inkscape::UI::get_monitor_geometry_primary();
+    auto const screen_width  = monitor_geometry.get_width();
+    auto const screen_height = monitor_geometry.get_height();
 
     // If there are stored values for where the dialog should be
     // located, then restore the dialog to that position.
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index f48f40879..3ec38edf9 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -17,12 +17,10 @@
 
 #include "uxmanager.h"
 #include "desktop.h"
+#include "ui/monitor.h"
 #include "util/ege-tags.h"
 #include "widgets/toolbox.h"
 
-#if GTKMM_CHECK_VERSION(3,22,0)
-# include <gdkmm/monitor.h>
-#endif
 
 using std::vector;
 
@@ -125,27 +123,11 @@ UXManagerImpl::UXManagerImpl() :
     tags.addTag(ege::Tag("Icons"));
 
     // Figure out if we're on a widescreen display
-#if GTKMM_CHECK_VERSION(3,22,0)
-    auto display = Gdk::Display::get_default();
-    auto monitor = display->get_primary_monitor();
-
-    // Fallback to monitor number 0 if the user hasn't configured a primary monitor
-    if (!monitor) {
-        monitor = display->get_monitor(0);
-    }
+    Gdk::Rectangle monitor_geometry = Inkscape::UI::get_monitor_geometry_primary();
+    int const width  = monitor_geometry.get_width();
+    int const height = monitor_geometry.get_height();
 
-    if(monitor) {
-        Gdk::Rectangle monitor_geometry;
-        monitor->get_geometry(monitor_geometry);
-
-        int const width  = monitor_geometry.get_width();
-        int const height = monitor_geometry.get_height();
-#else
-    Glib::RefPtr<Gdk::Screen> defaultScreen = Gdk::Screen::get_default();
-    if (defaultScreen) {
-        int width = defaultScreen->get_width();
-        int height = defaultScreen->get_height();
-#endif
+    if (width && height) {
         gdouble aspect = static_cast<gdouble>(width) / static_cast<gdouble>(height);
         if (aspect > 1.65) {
             _widescreen = true;