Fix inconsistent window resizing

pi2-view/include/MapApp.hpp

@@ -48,6 +48,7 @@ private:
   void onVehicleRowSelected(Gtk::ListBoxRow *row);
   void refreshVehicleLabels(const DrawableVehicle &vehicle);
   void refreshArea(int x, int y, int width, int height);
+  void resizeWindow();
   MapArea mapArea;
   Gtk::Window win;
   Gtk::ListBox *listBox;

pi2-view/src/MapApp.cpp

@@ -88,8 +88,8 @@ void MapApp::onZoomEntryActivate() {
   std::istringstream zoomBuffer(input);
   zoomBuffer >> zoom;
   mapArea.setScale(zoom / 100);
-  // The window is only resizing, when called from the main thread like this:
-  mapArea.adaptSizeRequest();
+  Glib::signal_idle().connect_once([this]() { mapArea.adaptSizeRequest(); },
+                                   Glib::PRIORITY_HIGH_IDLE + 10);
 
   std::ostringstream formatBuffer;
   formatBuffer << zoom << '%';
@@ -105,8 +105,8 @@ void MapApp::onZoomSelectionChanged() {
     std::istringstream zoomBuffer(selection);
     zoomBuffer >> zoom;
     mapArea.setScale(zoom / 100);
-    // The window is only resizing, when called from the main thread like this:
-    mapArea.adaptSizeRequest();
+    Glib::signal_idle().connect_once([this]() { mapArea.adaptSizeRequest(); },
+                                     Glib::PRIORITY_HIGH_IDLE + 10);
   }
 }
 
@@ -160,6 +160,12 @@ void MapApp::setTimeLabel(const std::chrono::minutes minutes) {
 
 void MapApp::addJunction(const double x, const double y) {
   auto &junction = junctions.emplace_back(x, y);
+  Glib::signal_idle().connect_once(
+      [this]() {
+        mapArea.adaptSizeRequest();
+        resizeWindow();
+      },
+      Glib::PRIORITY_HIGH_IDLE + 10);
   int xRegion, yRegion, widthRegion, heightRegion;
   junction.getRegion(xRegion, yRegion, widthRegion, heightRegion);
   Glib::signal_idle().connect_once(
@@ -172,8 +178,12 @@ void MapApp::addJunction(const double x, const double y) {
 void MapApp::addRoad(std::string laneThereName, std::string laneBackName,
                      std::vector<std::valarray<double>> coordinates) {
   auto &road = roads.emplace_back(laneThereName, laneBackName, coordinates);
-  // The window is only resizing, when called from the main thread like this:
+  Glib::signal_idle().connect_once(
+      [this]() {
         mapArea.adaptSizeRequest();
+        resizeWindow();
+      },
+      Glib::PRIORITY_HIGH_IDLE + 10);
   int xRegion, yRegion, widthRegion, heightRegion;
   road.getRegion(xRegion, yRegion, widthRegion, heightRegion);
   Glib::signal_idle().connect_once(
@@ -264,3 +274,10 @@ void MapApp::addOrReplaceVehicle(const std::string &vehicleName,
     listBox->select_row(*listBoxRow);
   }
 }
+
+void MapApp::resizeWindow() {
+  Gtk::Requisition minimumSize, naturalSize;
+  win.get_preferred_size(minimumSize, naturalSize);
+  win.resize(static_cast<int>(naturalSize.width),
+             static_cast<int>(naturalSize.height));
+}