[Libreoffice-commits] core.git: sfx2/source

[Kshitij Pathania]

 sfx2/source/notebookbar/NotebookbarPopup.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4c6e11886a9d396bf7be18e9e3209a73c6e303ad
Author: Kshitij Pathania <kshitijpathania at gmail.com>
Date:   Tue Jun 12 01:49:55 2018 +0530

    resizing of optionalbox now follows priority order strictly
    
    earlier box were not following the assigned priorities thus
    causing the reordering issue
    
    Change-Id: I8631312946322164a358d70fd9c47aa6ddfb95e2
    Reviewed-on: https://gerrit.libreoffice.org/55644
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sfx2/source/notebookbar/NotebookbarPopup.cxx b/sfx2/source/notebookbar/NotebookbarPopup.cxx
index 9ea14c202cf2..aa2b6e8c277a 100644
--- a/sfx2/source/notebookbar/NotebookbarPopup.cxx
+++ b/sfx2/source/notebookbar/NotebookbarPopup.cxx
@@ -42,7 +42,8 @@ void NotebookbarPopup::PopupModeEnd()
         vcl::Window* pWindow = m_pBox->GetChild(0);
         pWindow->SetParent(m_pParent);
 
-        if (m_pParent)
+        // resize after all children of box are empty
+        if (m_pParent && !m_pBox->GetChildCount())
             m_pParent->Resize();
     }