[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5

Jan-Marek Glogowski (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 13 05:15:15 UTC 2019


 vcl/qt5/Qt5Menu.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 221f27433900490e2b00bd4ed6957ab36ecadb33
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Jun 13 02:33:20 2019 +0000
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Jun 13 07:14:43 2019 +0200

    Qt5 correctly hide menu bar in tabbed mode
    
    Change-Id: I179780c2df5637b8a28c3a77b829319b1a64845b
    Reviewed-on: https://gerrit.libreoffice.org/73924
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 9758b9b6e52e8e8a8a5cc24b51d62a853a3def82)
    Reviewed-on: https://gerrit.libreoffice.org/73926

diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 435cc53363d4..9ca4d54d45a3 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -545,8 +545,8 @@ Qt5Menu* Qt5Menu::GetTopLevel()
 
 void Qt5Menu::ShowMenuBar(bool bVisible)
 {
-    if (mpQMenuBar && (bVisible != mpQMenuBar->isVisible()))
-        bVisible ? mpQMenuBar->show() : mpQMenuBar->hide();
+    if (mpQMenuBar)
+        mpQMenuBar->setVisible(bVisible);
 }
 
 const Qt5Frame* Qt5Menu::GetFrame() const


More information about the Libreoffice-commits mailing list