Merge branch 'qml'

[mdictionary] / src / mdictionary / qml / IconButton.qml

diff --git a/src/mdictionary/qml/IconButton.qml b/src/mdictionary/qml/IconButton.qml
index 19d3d70..37825a7 100644 (file)
--- a/src/mdictionary/qml/IconButton.qml
+++ b/src/mdictionary/qml/IconButton.qml
@@ -4,10 +4,12 @@ Rectangle {
     id: rectangle
 
     property alias pathToIcon: image.source;
-    property int iconWidth:rectangle.width;
-    property int iconHeight:rectangle.height;
+    property int iconWidth:rectangle.width-8;
+    property int iconHeight:rectangle.height-8;
 
     signal clicked;
+    function press() { mouseArea.pressed }
+
     radius: 50
 
     MouseArea {
@@ -31,17 +33,16 @@ Rectangle {
 
     Image {
         id: image1
-        z: 1
         smooth: true
-        width: (35*parent.height)/107 +1
+        width:  (image1.sourceSize.width*parent.height)/image1.sourceSize.height +1 //(35*parent.height)/107 +1
         height: parent.height
         anchors.left: parent.left
         source: "qrc:/button/buttonLeft.png"
+        fillMode:Image.Stretch
     }
 
     Image {
         id: image3
-        z: 1
         smooth: true
         height: parent.height
         anchors.right: image2.left
@@ -49,18 +50,20 @@ Rectangle {
         anchors.left: image1.right
         anchors.leftMargin: -1
         source: "qrc:/button/buttonCenter.png"
+        fillMode:Image.Stretch
+        //fillMode: Image.TileHorizontally
 
     }
 
 
     Image {
         id: image2
-        z: 1
         smooth: true
-        width: (35*parent.height)/107 +1
+        width: (image1.sourceSize.width*parent.height)/image1.sourceSize.height +1//(35*parent.height)/107 +1
         height: parent.height
         anchors.right: parent.right
         source: "qrc:/button/buttonR.png"
+        fillMode:Image.Stretch
     }
 
 
@@ -78,6 +81,14 @@ Rectangle {
             PropertyChanges { target: image1; source: "qrc:/button/buttonLeftPushed.png" }
             PropertyChanges { target: image3; source: "qrc:/button/buttonCenterPushed.png" }
             PropertyChanges { target: image2; source: "qrc:/button/buttonRightPushed.png" }
+        },
+        State {
+            name: "focused";
+            when: (rectangle.enabled && !mouseArea.pressed && rectangle.focus)
+
+            PropertyChanges { target: image1; source: "qrc:/button/buttonLeftFocus.png" }
+            PropertyChanges { target: image3; source: "qrc:/button/buttonCenterFocus.png" }
+            PropertyChanges { target: image2; source: "qrc:/button/buttonRFocus.png" }
         }
     ]
 }