mirror of
https://github.com/Swordfish90/cool-retro-term.git
synced 2025-04-19 17:20:45 +01:00
Fix: change workaround used to hide the menubar. This works with Qt 5.4
This commit is contained in:
parent
f4bd4fe69b
commit
f9e68a6854
@ -36,10 +36,12 @@ ApplicationWindow{
|
|||||||
property bool fullscreen: appSettings.fullscreen
|
property bool fullscreen: appSettings.fullscreen
|
||||||
onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
|
onFullscreenChanged: visibility = (fullscreen ? Window.FullScreen : Window.Windowed)
|
||||||
|
|
||||||
//Workaround: if menubar is assigned ugly margins are visible.
|
//Workaround: Without __contentItem a ugly thin border is visible.
|
||||||
menuBar: Qt.platform.os === "osx"
|
menuBar: CRTMainMenuBar{
|
||||||
? defaultMenuBar
|
id: mainMenu
|
||||||
: appSettings.showMenubar ? defaultMenuBar : null
|
visible: (Qt.platform.os === "osx" || appSettings.showMenubar)
|
||||||
|
__contentItem.visible: mainMenu.visible
|
||||||
|
}
|
||||||
|
|
||||||
color: "#00000000"
|
color: "#00000000"
|
||||||
title: terminalContainer.title || qsTr("cool-retro-term")
|
title: terminalContainer.title || qsTr("cool-retro-term")
|
||||||
@ -102,9 +104,6 @@ ApplicationWindow{
|
|||||||
aboutDialog.show();
|
aboutDialog.show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CRTMainMenuBar{
|
|
||||||
id: defaultMenuBar
|
|
||||||
}
|
|
||||||
ApplicationSettings{
|
ApplicationSettings{
|
||||||
id: appSettings
|
id: appSettings
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user