[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [okular/Applications/17.04] shell: Shell: Fix sync "Show menubar" action status
From:       Albert Astals Cid <null () kde ! org>
Date:       2017-07-02 16:00:11
Message-ID: E1dRhIB-0005jI-8V () code ! kde ! org
[Download RAW message or body]

Git commit 3b5f19fd9d67b49a7009b5810c5dd4ecb1a7cede by Albert Astals Cid.
Committed on 02/07/2017 at 16:00.
Pushed by aacid into branch 'Applications/17.04'.

Shell: Fix sync "Show menubar" action status

No need to sync it when Shell uses a native menubar

M  +1    -1    shell/shell.cpp

https://commits.kde.org/okular/3b5f19fd9d67b49a7009b5810c5dd4ecb1a7cede

diff --git a/shell/shell.cpp b/shell/shell.cpp
index f8f1dbe3..dae56158 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -497,7 +497,7 @@ void Shell::setFullScreen( bool useFullScreen )
 =

 void Shell::showEvent(QShowEvent *e)
 {
-    if (m_showMenuBarAction)
+    if (!menuBar()->isNativeMenuBar() && m_showMenuBarAction)
         m_showMenuBarAction->setChecked( menuBar()->isVisible() );
 =

     KParts::MainWindow::showEvent(e);
[prev in list] [next in list] [prev in thread] [next in thread]