summaryrefslogtreecommitdiffstats
path: root/basicsuite/enterprise-gallery/PieMenuControlView.qml
diff options
context:
space:
mode:
authorKalle Viironen <kalle.viironen@digia.com>2014-04-28 11:53:55 +0300
committerQt Gerrit Server <srv.gerrit-noreply@digia.com>2014-04-28 11:53:55 +0300
commitcd70f5f95a804370e4da300c134cf615ce60fb46 (patch)
treea21da3151402a382441177c36a262f60cbc9ed6e /basicsuite/enterprise-gallery/PieMenuControlView.qml
parent4b889e3e5ff70ec3486852292e504bd6c9a55d4d (diff)
parent6874ceb2b5525d108a0628bff437e697f0fca329 (diff)
Merge "Merge branch 'stable' into dev" into dev
Diffstat (limited to 'basicsuite/enterprise-gallery/PieMenuControlView.qml')
-rw-r--r--basicsuite/enterprise-gallery/PieMenuControlView.qml31
1 files changed, 2 insertions, 29 deletions
diff --git a/basicsuite/enterprise-gallery/PieMenuControlView.qml b/basicsuite/enterprise-gallery/PieMenuControlView.qml
index cba341b..2c06176 100644
--- a/basicsuite/enterprise-gallery/PieMenuControlView.qml
+++ b/basicsuite/enterprise-gallery/PieMenuControlView.qml
@@ -21,7 +21,7 @@
import QtQuick 2.0
import QtGraphicalEffects 1.0
import QtQuick.Controls 1.0
-import QtQuick.Enterprise.Controls 1.0
+import QtQuick.Enterprise.Controls 1.1
Rectangle {
id: view
@@ -94,34 +94,7 @@ Rectangle {
anchors.fill: parent
onClicked: {
- pieMenu.popup(touchArea.mouseX, touchArea.mouseY)
- }
- }
-
- Item {
- width: labelText.width
- height: labelText.height
- anchors.bottom: pieMenu.top
- anchors.bottomMargin: 10
- anchors.horizontalCenter: pieMenu.horizontalCenter
- visible: pieMenu.visible
-
- Item {
- id: labelBlurGuard
- anchors.centerIn: parent
- width: labelText.implicitWidth * 2
- height: labelText.implicitHeight * 2
-
- Text {
- id: labelText
- font.pointSize: 20
- text: pieMenu.currentIndex !== -1 ? pieMenu.menuItems[pieMenu.currentIndex].text : ""
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- anchors.centerIn: parent
- color: "#ccc"
- antialiasing: true
- }
+ pieMenu.popup(touchArea.mouseX, touchArea.mouseY);
}
}