Fixed|UI|Client: Inadvertent log clearing

Now there is a separate method for resetting the height of the log widget without clearing all entries. Also the content height of the LogWidget is reset to zero when the widget is cleared.
skyjake · Nov 23, 2014 · 4f8426c · 4f8426c
1 parent 348427e
commit 4f8426c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/doomsday/client/include/ui/widgets/consolewidget.h b/doomsday/client/include/ui/widgets/consolewidget.h
@@ -77,6 +77,7 @@ public slots:
     void openLog();
     void closeLog();
     void clearLog();
+    void zeroLogHeight();
     void showFullLog();
     void setFullyOpaque();
     void commandLineFocusGained();

diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp
@@ -1713,7 +1713,7 @@ bool App_ChangeGame(Game &game, bool allowReload)
         }
         else
         {
-            ClientWindow::main().console().clearLog();
+            ClientWindow::main().console().zeroLogHeight();
         }
     }
 #endif

diff --git a/doomsday/client/src/ui/widgets/consolewidget.cpp b/doomsday/client/src/ui/widgets/consolewidget.cpp
@@ -545,11 +545,16 @@ void ConsoleWidget::closeLog()
 }
 
 void ConsoleWidget::clearLog()
+{
+    zeroLogHeight();
+    d->log->clear();
+}
+
+void ConsoleWidget::zeroLogHeight()
 {
     d->height->set(0);
     d->log->scrollToBottom();
     d->log->enablePageKeys(false);
-    d->log->clear();
 }
 
 void ConsoleWidget::showFullLog()

diff --git a/doomsday/client/src/ui/widgets/taskbarwidget.cpp b/doomsday/client/src/ui/widgets/taskbarwidget.cpp
@@ -602,7 +602,7 @@ void TaskBarWidget::open()
 
         unsetBehavior(DisableEventDispatchToChildren);
 
-        d->console->clearLog();
+        d->console->zeroLogHeight();
 
         d->vertShift->set(0, OPEN_CLOSE_SPAN);
         setOpacity(1, OPEN_CLOSE_SPAN);

diff --git a/doomsday/libappfw/src/widgets/logwidget.cpp b/doomsday/libappfw/src/widgets/logwidget.cpp
@@ -389,6 +389,7 @@ public Font::RichFormat::IStyle
     {
         sink.clear();
         clearCache();
+        self.setContentHeight(0);
     }
 
     void clearCache()