libgui|GLWindow: Fixed the initial window size notification

skyjake · Sep 1, 2019 · 22c9bed · 22c9bed
1 parent 195fb6c
commit 22c9bed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/doomsday/apps/client/src/ui/clientwindow.cpp b/doomsday/apps/client/src/ui/clientwindow.cpp
@@ -517,7 +517,7 @@ DE_PIMPL(ClientWindow)
         LOG_AS("ClientWindow");
 
         Size size = self().pixelSize();
-        LOG_TRACE("Window resized to %s pixels", size.asText());
+        LOG_VERBOSE("Window resized to %s pixels") << size.asText();
 
         GLState::current().setViewport(Rectangleui(0, 0, size.x, size.y));
 
@@ -849,8 +849,7 @@ ClientWindow::ClientWindow(String const &id)
     // Stay out from under the virtual keyboard.
     connect(this, &GLWindow::rootDimensionsChanged, [this] (QRect rect)
     {
-        d->root.rootOffset().setValue(Vec2f(0, int(rect.height()) - int(pixelSize().y)),
-                                      0.3);
+        d->root.rootOffset().setValue(Vec2f(0, int(rect.height()) - int(pixelSize().y)), 0.3);
     });
 #endif
 }

diff --git a/doomsday/libs/gui/src/glwindow.cpp b/doomsday/libs/gui/src/glwindow.cpp
@@ -145,6 +145,8 @@ DE_PIMPL(GLWindow)
 
         LIBGUI_ASSERT_GL_OK();
 
+        debug("Window pixel size at notifyReady: %s", currentSize.asText().c_str());
+
         // Everybody can perform GL init now.
         DE_FOR_PUBLIC_AUDIENCE2(Init, i)   i->windowInit(self());
         DE_FOR_PUBLIC_AUDIENCE2(Resize, i) i->windowResized(self());
@@ -420,6 +422,15 @@ void GLWindow::setGeometry(const Rectanglei &rect)
 {
     SDL_SetWindowPosition(d->window, rect.left(),  rect.top());
     SDL_SetWindowSize    (d->window, rect.width(), rect.height());
+
+    // Update the current size immediately.
+    Vec2i pixels;
+    SDL_GL_GetDrawableSize(d->window, &pixels.x, &pixels.y);
+    if (d->currentSize != pixels.toVec2ui())
+    {
+        d->currentSize = pixels.toVec2ui();
+        DE_FOR_AUDIENCE2(Resize, i) { i->windowResized(*this); }
+    }
 }
 
 #if defined (DE_MOBILE)