From ae6849adec214abad75ebec5f8522bf7dd5c1253 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Thu, 6 Dec 2018 19:28:18 +0800
Subject: [PATCH] MainWindow: fix layout restore

---
 src/vmainwindow.cpp         | 10 +++-------
 src/vtextdocumentlayout.cpp |  2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/vmainwindow.cpp b/src/vmainwindow.cpp
index b8b3324a..431708da 100644
--- a/src/vmainwindow.cpp
+++ b/src/vmainwindow.cpp
@@ -2310,6 +2310,9 @@ void VMainWindow::saveStateAndGeometry()
 
 void VMainWindow::restoreStateAndGeometry()
 {
+    m_toolDock->setVisible(g_config->getToolsDockChecked());
+    m_searchDock->setVisible(g_config->getSearchDockChecked());
+
     const QByteArray geometry = g_config->getMainWindowGeometry();
     if (!geometry.isEmpty()) {
         restoreGeometry(geometry);
@@ -2320,9 +2323,6 @@ void VMainWindow::restoreStateAndGeometry()
         restoreState(state);
     }
 
-    m_toolDock->setVisible(g_config->getToolsDockChecked());
-    m_searchDock->setVisible(g_config->getSearchDockChecked());
-
     const QByteArray splitterState = g_config->getMainSplitterState();
     if (!splitterState.isEmpty()) {
         m_mainSplitter->restoreState(splitterState);
@@ -2334,8 +2334,6 @@ void VMainWindow::restoreStateAndGeometry()
     }
 
     m_naviBox->setCurrentIndex(g_config->getNaviBoxCurrentIndex());
-
-    centralWidget()->updateGeometry();
 }
 
 void VMainWindow::handleCurrentDirectoryChanged(const VDirectory *p_dir)
@@ -2867,7 +2865,6 @@ bool VMainWindow::toggleToolsDockByCaptain(void *p_target, void *p_data)
     Q_UNUSED(p_data);
     VMainWindow *obj = static_cast<VMainWindow *>(p_target);
     obj->m_toolDock->setVisible(!obj->m_toolDock->isVisible());
-    obj->centralWidget()->updateGeometry();
     return true;
 }
 
@@ -2877,7 +2874,6 @@ bool VMainWindow::toggleSearchDockByCaptain(void *p_target, void *p_data)
     VMainWindow *obj = static_cast<VMainWindow *>(p_target);
     bool visible = obj->m_searchDock->isVisible();
     obj->m_searchDock->setVisible(!visible);
-    obj->centralWidget()->updateGeometry();
     if (!visible) {
         obj->m_searcher->focusToSearch();
         return false;
diff --git a/src/vtextdocumentlayout.cpp b/src/vtextdocumentlayout.cpp
index da60dbc7..69c2cba8 100644
--- a/src/vtextdocumentlayout.cpp
+++ b/src/vtextdocumentlayout.cpp
@@ -450,9 +450,11 @@ void VTextDocumentLayout::documentChanged(int p_from, int p_charsRemoved, int p_
         changeEndBlock = doc->findBlock(p_from + charsChanged);
     }
 
+    /*
     qDebug() << "documentChanged" << p_from << p_charsRemoved << p_charsAdded
              << m_blockCount << newBlockCount
              << changeStartBlock.blockNumber() << changeEndBlock.blockNumber();
+    */
 
     bool needRelayout = true;
     if (changeStartBlock == changeEndBlock