Mercurial > octave
changeset 24130:6fdbdb66d7cb
set editor menu bar as non-native menu bar on all platforms
* file-editor.cc (construct): set native menu bar to false on all systems
not only on mac os
| author | Torsten <mttl@mailbox.org> |
|---|---|
| date | Sun, 08 Oct 2017 10:34:43 +0200 |
| parents | f80dc6db9d18 |
| children | 0dc49e906fa5 |
| files | libgui/src/m-editor/file-editor.cc |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.cc Tue Jul 12 22:19:54 2016 -0700 +++ b/libgui/src/m-editor/file-editor.cc Sun Oct 08 10:34:43 2017 +0200 @@ -1696,10 +1696,13 @@ // FIXME: what was the intended purpose of this unused variable? // QStyle *editor_style = QApplication::style (); + + // Menu bar: do not set it native, required in MacOS and Ubuntu Unity (Qt5) + // for a visible menu bar in the editor widget. This property is ignored + // on other platforms. m_menu_bar = new QMenuBar (editor_widget); -#if defined (Q_OS_MAC) m_menu_bar->setNativeMenuBar (false); -#endif + m_tool_bar = new QToolBar (editor_widget); m_tool_bar->setMovable (true);