alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EditBubble.qml: put buttons in the order "copy" and then "paste", double

Browse Source 
buttons' MouseArea sizeto make it easier to tap on them, and add space
between the buttons.

CCBUG: 296943
This commit is contained in:
Lamarque V. Souza 2012-03-30 20:08:42 -03:00
parent ed04c28fe2
commit 82fb04ccbf
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
View File

@ -27,8 +27,8 @@ PlasmaCore.FrameSvgItem {
property int iconSize: 32; property int iconSize: 32;
imagePath: "dialogs/background" imagePath: "dialogs/background"
width: (iconSize*2) + iconSize width: 4*iconSize
height: iconSize*2 height: 2*iconSize
z: 100000 z: 100000
//anchors { top: parent.bottom; right: parent.right; topMargin: -(iconSize/4); } //anchors { top: parent.bottom; right: parent.right; topMargin: -(iconSize/4); }
@ -39,26 +39,9 @@ PlasmaCore.FrameSvgItem {
Row { Row {
id: buttonRow id: buttonRow
spacing: 4 spacing: iconSize
anchors { horizontalCenter: parent.horizontalCenter; verticalCenter: parent.verticalCenter; margins: 8; } anchors { horizontalCenter: parent.horizontalCenter; verticalCenter: parent.verticalCenter; margins: 8; }
height: editBubble.iconSize height: editBubble.iconSize
QIconItem {
id: pasteIcon
icon: QIcon("edit-paste")
width: editBubble.iconSize
height: editBubble.iconSize
enabled: textInput.canPaste
MouseArea {
anchors.fill: parent;
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: pasteIcon; properties: "scale";
from: 0.9; to: 1.0;
duration: 175; easing.type: Easing.OutExpo; }
}
}
QIconItem { QIconItem {
id: copyIcon id: copyIcon
icon: QIcon("edit-copy") icon: QIcon("edit-copy")
@ -66,7 +49,9 @@ PlasmaCore.FrameSvgItem {
height: editBubble.iconSize height: editBubble.iconSize
enabled: textInput.selectedText != "" enabled: textInput.selectedText != ""
MouseArea { MouseArea {
anchors.fill: parent; anchors.centerIn: parent
width: 2*parent.width
height: 2*parent.height
onClicked: { textField.copy(); editBubble.state = "collapsed"; } onClicked: { textField.copy(); editBubble.state = "collapsed"; }
onPressed: PropertyAnimation { target: copyIcon; properties: "scale"; onPressed: PropertyAnimation { target: copyIcon; properties: "scale";
from: 1.0; to: 0.9; from: 1.0; to: 0.9;
@ -76,6 +61,25 @@ PlasmaCore.FrameSvgItem {
duration: 175; easing.type: Easing.OutExpo; } duration: 175; easing.type: Easing.OutExpo; }
} }
} }
QIconItem {
id: pasteIcon
icon: QIcon("edit-paste")
width: editBubble.iconSize
height: editBubble.iconSize
enabled: textInput.canPaste
MouseArea {
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: pasteIcon; properties: "scale";
from: 0.9; to: 1.0;
duration: 175; easing.type: Easing.OutExpo; }
}
}
} }
states: [ states: [
State { State {

2
declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
View File

@ -214,4 +214,4 @@ Item {
editBubble.state = "collapsed"; editBubble.state = "collapsed";
} }
} }
} }