Fixed: UI resizing in busy mode

BusyWidget was not handled viewResized events.
skyjake · Mar 6, 2013 · 256e1f4 · 256e1f4
1 parent cdac8d8
commit 256e1f4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/doomsday/client/include/ui/busywidget.h b/doomsday/client/include/ui/busywidget.h
@@ -30,6 +30,7 @@ class BusyWidget : public GuiWidget
     BusyWidget(de::String const &name = "");
     ~BusyWidget();
 
+    void viewResized();
     void update();
     void draw();
     bool handleEvent(de::Event const &event);

diff --git a/doomsday/client/include/ui/ui_main.h b/doomsday/client/include/ui/ui_main.h
@@ -23,6 +23,7 @@
 #define LIBDENG_UI_MAIN_H
 
 #include <de/rect.h>
+#include "dd_input.h" // ddevent_t
 #include "MaterialVariantSpec"
 
 #ifdef __cplusplus

diff --git a/doomsday/client/src/ui/busywidget.cpp b/doomsday/client/src/ui/busywidget.cpp
@@ -19,6 +19,12 @@
 #include "ui/busywidget.h"
 #include "ui/busyvisual.h"
 #include "busymode.h"
+#include "sys_system.h"
+#include "render/r_main.h"
+#include "ui/ui_main.h"
+#include "ui/window.h"
+
+#include <de/RootWidget>
 
 using namespace de;
 
@@ -38,6 +44,28 @@ BusyWidget::~BusyWidget()
     delete d;
 }
 
+void BusyWidget::viewResized()
+{
+    if(!BusyMode_Active() || isDisabled() || Sys_IsShuttingDown()) return;
+
+    Window_GLActivate(Window_Main()); // needed for legacy stuff
+
+    //DENG_ASSERT(BusyMode_Active());
+
+    LOG_AS("BusyWidget");
+    LOG_DEBUG("View resized to ") << root().viewSize().asText();
+
+    // Update viewports.
+    R_SetViewGrid(0, 0);
+    R_UseViewPort(0);
+    R_LoadSystemFonts();
+
+    if(UI_IsActive())
+    {
+        UI_UpdatePageLayout();
+    }
+}
+
 void BusyWidget::update()
 {
     DENG_ASSERT(BusyMode_Active());

diff --git a/doomsday/client/src/ui/legacywidget.cpp b/doomsday/client/src/ui/legacywidget.cpp
@@ -63,14 +63,14 @@ LegacyWidget::~LegacyWidget()
 
 void LegacyWidget::viewResized()
 {
-    if(isDisabled() || Sys_IsShuttingDown()) return;
+    if(BusyMode_Active() || isDisabled() || Sys_IsShuttingDown()) return;
 
     LOG_AS("LegacyWidget");
     LOG_DEBUG("View resized to ") << root().viewSize().asText();
 
     // Update viewports.
     R_SetViewGrid(0, 0);
-    if(BusyMode_Active() || UI_IsActive() || !App_GameLoaded())
+    if(/*BusyMode_Active() ||*/ UI_IsActive() || !App_GameLoaded())
     {
         // Update for busy mode.
         R_UseViewPort(0);