diff options
author | Sebastian Kügler <sebas@kde.org> | 2016-01-06 04:40:33 +0100 |
---|---|---|
committer | Sebastian Kügler <sebas@kde.org> | 2016-01-06 04:41:41 +0100 |
commit | 548d6fc956061cd1edb177447cdf07104d92b9c7 (patch) | |
tree | e8263e890f0a3294cc5b013fa4e5b61ab46ab037 /qt-mobile/qml/mobilecomponents/ApplicationWindow.qml | |
parent | 8664925e20f4f4b700ace48765477a9ca3fb36dd (diff) | |
download | subsurface-548d6fc956061cd1edb177447cdf07104d92b9c7.tar.gz |
sync with mobilecomponents a85365111 + patches
This is the latest state of the upstream art from Plasma, plus our
patches to disable the gamma effect on the icon, and the drawer removed.
Signed-off-by: Sebastian Kügler <sebas@kde.org>
Diffstat (limited to 'qt-mobile/qml/mobilecomponents/ApplicationWindow.qml')
-rw-r--r-- | qt-mobile/qml/mobilecomponents/ApplicationWindow.qml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/qt-mobile/qml/mobilecomponents/ApplicationWindow.qml b/qt-mobile/qml/mobilecomponents/ApplicationWindow.qml index 76662f549..0eaa81ec0 100644 --- a/qt-mobile/qml/mobilecomponents/ApplicationWindow.qml +++ b/qt-mobile/qml/mobilecomponents/ApplicationWindow.qml @@ -47,9 +47,22 @@ ApplicationWindow { */ property alias pageStack: __pageStack + function showPassiveNotification(message, timeout, actionText, callBack) { + if (!__actionButton.__passiveNotification) { + var component = Qt.createComponent("private/PassiveNotification.qml"); + __actionButton.__passiveNotification = component.createObject(contentItem.parent); + } + + __actionButton.__passiveNotification.showNotification(message, timeout, actionText, callBack); + } + PageRow { id: __pageStack - anchors.fill: parent + anchors { + fill: parent + bottomMargin: Qt.inputMethod.visible ? (root.y + root.height) - (Qt. +inputMethod.keyboardRectangle.y) : 0 + } focus: true Keys.onReleased: { if (event.key == Qt.Key_Back && stackView.depth > 1) { @@ -76,6 +89,8 @@ ApplicationWindow { property alias actionButton: __actionButton ActionButton { id: __actionButton + //put it there just to make it not accessible bu users + property Item __passiveNotification z: 9999 anchors.bottom: parent.bottom x: parent.width/2 - width/2 |