Simplify ButtonArea and IconMenuItem (and add support for "enabled")

2014-02-04 22:33:27 +01:00 · 2014-02-04 22:33:27 +01:00 · 8561b9c49a
commit 8561b9c49a
parent eefbe0db27
2 changed files with 8 additions and 11 deletions
--- a/touch/ButtonArea.qml
+++ b/touch/ButtonArea.qml
@ -20,19 +20,13 @@

 import QtQuick 2.0

-Rectangle {
-    id: buttonArea
-
-    signal clicked
-
-    property alias pressed: mouseArea.pressed
+MouseArea {
+    id: mouseArea
    property bool transparent: false
-    color: pressed?'#33ffffff':(transparent?'#00000000':'#88000000')

-    MouseArea {
-        id: mouseArea
+    Rectangle {
        anchors.fill: parent
-        onClicked: buttonArea.clicked();
+        color: mouseArea.pressed?'#33ffffff':(mouseArea.transparent?'#00000000':'#88000000')
+        visible: parent.enabled
    }
 }
-