1
0
mirror of https://github.com/Swordfish90/cool-retro-term.git synced 2025-01-18 20:20:45 +00:00

Fix: change workaround used to hide the menubar. This works with Qt 5.4

This commit is contained in:
Filippo Scognamiglio 2014-12-15 11:56:40 +01:00
parent f4bd4fe69b
commit f9e68a6854

View File

@ -36,10 +36,12 @@ ApplicationWindow{
property bool fullscreen: appSettings.fullscreen
onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
//Workaround: if menubar is assigned ugly margins are visible.
menuBar: Qt.platform.os === "osx"
? defaultMenuBar
: appSettings.showMenubar ? defaultMenuBar : null
//Workaround: Without __contentItem a ugly thin border is visible.
menuBar: CRTMainMenuBar{
id: mainMenu
visible: (Qt.platform.os === "osx" || appSettings.showMenubar)
__contentItem.visible: mainMenu.visible
}
color: "#00000000"
title: terminalContainer.title || qsTr("cool-retro-term")
@ -102,9 +104,6 @@ ApplicationWindow{
aboutDialog.show();
}
}
CRTMainMenuBar{
id: defaultMenuBar
}
ApplicationSettings{
id: appSettings
}