[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-runtime] plasma/declarativeimports/plasmacomponents/platformcomponents/touch:
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2012-03-30 23:12:22
Message-ID: 20120330231222.0B202A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit c5f0b815230057cf8a5a8be0ce48a9e647208d77 by Lamarque V. Souza.
Committed on 31/03/2012 at 01:08.
Pushed by lvsouza into branch 'master'.

EditBubble.qml: put buttons in the order "copy" and then "paste", double
buttons' MouseArea sizeto make it easier to tap on them, and add space
between the buttons.

CCBUG: 296943

M  +21   -17   plasma/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
 M  +1    -1    plasma/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml


http://commits.kde.org/kde-runtime/c5f0b815230057cf8a5a8be0ce48a9e647208d77

diff --git a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml \
b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml \
                index 96ca25e..96f3968 100644
--- a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
                
+++ b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
 @@ -27,8 +27,8 @@ PlasmaCore.FrameSvgItem {
     property int iconSize: 32;
 
     imagePath: "dialogs/background"
-    width: (iconSize*2) + iconSize
-    height: iconSize*2
+    width:  4*iconSize
+    height: 2*iconSize
     z: 100000
     //anchors { top: parent.bottom; right: parent.right; topMargin: -(iconSize/4); }
 
@@ -39,39 +39,43 @@ PlasmaCore.FrameSvgItem {
 
     Row {
         id: buttonRow
-        spacing: 4
+        spacing: iconSize
         anchors { horizontalCenter: parent.horizontalCenter; verticalCenter: \
parent.verticalCenter; margins: 8; }  height: editBubble.iconSize
         QIconItem {
-            id: pasteIcon
-            icon: QIcon("edit-paste")
+            id: copyIcon
+            icon: QIcon("edit-copy")
             width: editBubble.iconSize
             height: editBubble.iconSize
-            enabled: textInput.canPaste
+            enabled: textInput.selectedText != ""
             MouseArea {
-                anchors.fill: parent;
-                onClicked: { textField.paste(); editBubble.state = "collapsed"; }
-                onPressed: PropertyAnimation {  target: pasteIcon; properties: \
"scale"; +                anchors.centerIn: parent
+                width: 2*parent.width
+                height: 2*parent.height
+                onClicked: { textField.copy(); editBubble.state = "collapsed"; }
+                onPressed: PropertyAnimation {  target: copyIcon; properties: \
"scale";  from: 1.0; to: 0.9;
                                                 duration: 175; easing.type: \
                Easing.OutExpo; }
-                onReleased: PropertyAnimation { target: pasteIcon; properties: \
"scale"; +                onReleased: PropertyAnimation { target: copyIcon; \
properties: "scale";  from: 0.9; to: 1.0;
                                                 duration: 175; easing.type: \
Easing.OutExpo; }  }
         }
         QIconItem {
-            id: copyIcon
-            icon: QIcon("edit-copy")
+            id: pasteIcon
+            icon: QIcon("edit-paste")
             width: editBubble.iconSize
             height: editBubble.iconSize
-            enabled: textInput.selectedText != ""
+            enabled: textInput.canPaste
             MouseArea {
-                anchors.fill: parent;
-                onClicked: { textField.copy(); editBubble.state = "collapsed"; }
-                onPressed: PropertyAnimation {  target: copyIcon; properties: \
"scale"; +                anchors.centerIn: parent;
+                width: 2*parent.width
+                height: 2*parent.height
+                onClicked: { textField.paste(); editBubble.state = "collapsed"; }
+                onPressed: PropertyAnimation {  target: pasteIcon; properties: \
"scale";  from: 1.0; to: 0.9;
                                                 duration: 175; easing.type: \
                Easing.OutExpo; }
-                onReleased: PropertyAnimation { target: copyIcon; properties: \
"scale"; +                onReleased: PropertyAnimation { target: pasteIcon; \
properties: "scale";  from: 0.9; to: 1.0;
                                                 duration: 175; easing.type: \
Easing.OutExpo; }  }
diff --git a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml \
b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml \
                index 33a5a61..3144265 100644
--- a/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
                
+++ b/plasma/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
 @@ -214,4 +214,4 @@ Item {
             editBubble.state = "collapsed";
         }
     }
-}
\ No newline at end of file
+}


[prev in list] [next in list] [prev in thread] [next in thread]