From ca51f979b8c5576491ae1eeb29d5e9c9d552ba94 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Mon, 7 Feb 2022 14:19:02 +0100 Subject: [PATCH] FINALLY fixed the bug related to ALT+ shortcuts --- .../qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml | 4 ++-- .../eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml index c123a99..b300335 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/AppMenuBar.qml @@ -18,8 +18,8 @@ import QtQuick 2.12 import QtQuick.Dialogs 1.3 -import QtQuick.Controls 2.15 -//import eu.ad5001.MixedMenu 1.1 +//import QtQuick.Controls 2.15 +import eu.ad5001.MixedMenu 1.1 import "js/objects.js" as Objects import "js/historylib.js" as HistoryLib diff --git a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml index 7efbab3..5d2f6ab 100644 --- a/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml +++ b/LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/LogarithmPlotter.qml @@ -47,7 +47,7 @@ ApplicationWindow { SystemPalette { id: sysPalette; colorGroup: SystemPalette.Active } SystemPalette { id: sysPaletteIn; colorGroup: SystemPalette.Disabled } - menuBar: appMenu//.trueItem + menuBar: appMenu.trueItem AppMenuBar {id: appMenu} @@ -66,15 +66,16 @@ ApplicationWindow { z: 3 } - Drawer { + Item { id: sidebar width: 300 height: parent.height - y: root.menuBar.height + //y: root.menuBar.height readonly property bool inPortrait: root.width < root.height - modal: inPortrait + /*modal: true// inPortrait interactive: inPortrait position: inPortrait ? 0 : 1 + */ visible: !inPortrait @@ -137,8 +138,8 @@ ApplicationWindow { anchors.top: parent.top anchors.left: sidebar.inPortrait ? parent.left : sidebar.right height: parent.height - width: sidebar.inPortrait ? parent.width : parent.width - sidebar.position*sidebar.width - x: sidebar.position*sidebar.width + width: sidebar.inPortrait ? parent.width : parent.width - sidebar.width//*sidebar.position + x: sidebar.width//*sidebar.position xmin: settings.xmin ymax: settings.ymax