FINALLY fixed the bug related to ALT+ shortcuts
This commit is contained in:
parent
f4c6e82c6d
commit
ca51f979b8
2 changed files with 9 additions and 8 deletions
|
@ -18,8 +18,8 @@
|
||||||
|
|
||||||
import QtQuick 2.12
|
import QtQuick 2.12
|
||||||
import QtQuick.Dialogs 1.3
|
import QtQuick.Dialogs 1.3
|
||||||
import QtQuick.Controls 2.15
|
//import QtQuick.Controls 2.15
|
||||||
//import eu.ad5001.MixedMenu 1.1
|
import eu.ad5001.MixedMenu 1.1
|
||||||
import "js/objects.js" as Objects
|
import "js/objects.js" as Objects
|
||||||
import "js/historylib.js" as HistoryLib
|
import "js/historylib.js" as HistoryLib
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ ApplicationWindow {
|
||||||
SystemPalette { id: sysPalette; colorGroup: SystemPalette.Active }
|
SystemPalette { id: sysPalette; colorGroup: SystemPalette.Active }
|
||||||
SystemPalette { id: sysPaletteIn; colorGroup: SystemPalette.Disabled }
|
SystemPalette { id: sysPaletteIn; colorGroup: SystemPalette.Disabled }
|
||||||
|
|
||||||
menuBar: appMenu//.trueItem
|
menuBar: appMenu.trueItem
|
||||||
|
|
||||||
AppMenuBar {id: appMenu}
|
AppMenuBar {id: appMenu}
|
||||||
|
|
||||||
|
@ -66,15 +66,16 @@ ApplicationWindow {
|
||||||
z: 3
|
z: 3
|
||||||
}
|
}
|
||||||
|
|
||||||
Drawer {
|
Item {
|
||||||
id: sidebar
|
id: sidebar
|
||||||
width: 300
|
width: 300
|
||||||
height: parent.height
|
height: parent.height
|
||||||
y: root.menuBar.height
|
//y: root.menuBar.height
|
||||||
readonly property bool inPortrait: root.width < root.height
|
readonly property bool inPortrait: root.width < root.height
|
||||||
modal: inPortrait
|
/*modal: true// inPortrait
|
||||||
interactive: inPortrait
|
interactive: inPortrait
|
||||||
position: inPortrait ? 0 : 1
|
position: inPortrait ? 0 : 1
|
||||||
|
*/
|
||||||
visible: !inPortrait
|
visible: !inPortrait
|
||||||
|
|
||||||
|
|
||||||
|
@ -137,8 +138,8 @@ ApplicationWindow {
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: sidebar.inPortrait ? parent.left : sidebar.right
|
anchors.left: sidebar.inPortrait ? parent.left : sidebar.right
|
||||||
height: parent.height
|
height: parent.height
|
||||||
width: sidebar.inPortrait ? parent.width : parent.width - sidebar.position*sidebar.width
|
width: sidebar.inPortrait ? parent.width : parent.width - sidebar.width//*sidebar.position
|
||||||
x: sidebar.position*sidebar.width
|
x: sidebar.width//*sidebar.position
|
||||||
|
|
||||||
xmin: settings.xmin
|
xmin: settings.xmin
|
||||||
ymax: settings.ymax
|
ymax: settings.ymax
|
||||||
|
|
Loading…
Reference in a new issue