From 9f858e0cb6515c09b1bff1456e91de4ffd05c889 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sun, 24 Dec 2017 10:10:50 +0100 Subject: Name a few more widgets. Minor cleanup. --- src/ui/dialog/dialog.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/ui/dialog/dialog.cpp') diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index e50824c7b..fbbb4f869 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -168,9 +168,14 @@ void Dialog::read_geometry() #if WITH_GTKMM_3_22 auto const display = Gdk::Display::get_default(); - auto const monitor = display->get_primary_monitor(); + 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); + } - // If user hasn't configured a primary monitor, nullptr is returned. Gdk::Rectangle screen_geometry; if (monitor) { monitor->get_geometry(screen_geometry); @@ -179,7 +184,7 @@ void Dialog::read_geometry() auto const screen_height = screen_geometry.get_height(); #else auto const screen_width = gdk_screen_width(); - auto const screen_height = gdk_screen_width(); + auto const screen_height = gdk_screen_height(); #endif // If there are stored values for where the dialog should be -- cgit v1.2.3 From 8e2119c2042debcf51998631e64809e627b148c2 Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Mon, 25 Dec 2017 17:16:41 +0000 Subject: Use a macro for GtkMM version checks --- src/ui/dialog/dialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/dialog/dialog.cpp') diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index fbbb4f869..3d949a8c9 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -20,7 +20,7 @@ #include "dialog-manager.h" #include -#if WITH_GTKMM_3_22 +#if GTKMM_CHECK_VERSION(3,22,0) # include #endif @@ -166,7 +166,7 @@ void Dialog::read_geometry() resize(w, h); } -#if WITH_GTKMM_3_22 +#if GTKMM_CHECK_VERSION(3,22,0) auto const display = Gdk::Display::get_default(); auto monitor = display->get_primary_monitor(); -- cgit v1.2.3