mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync with mobilecomponents 9d8bf6d77d

Browse source 
- Fixes interactivity in context drawer.

- These are mostly cleanups that have been done pre-merge of these
components. This now is the state of master in plasma-mobile.

- makes navigation a bit more intuitive

Signed-off-by: Sebastian Kügler <sebas@kde.org>
This commit is contained in:
Sebastian Kügler 2015-12-04 00:27:35 +01:00
parent 72411eee63
commit b6f5f235f0
9 changed files with 74 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

19
qt-mobile/qml/mobilecomponents/ListItemWithActions.qml
View file

@ -50,7 +50,6 @@ Item {
*/
signal clicked
/**
* The user pressed the item with the mouse and didn't release it for a
* certain amount of time.
@ -93,9 +92,9 @@ Item {
}
width: parent ? parent.width : childrenRect.width
height: paddingItem.childrenRect.height + Units.smallSpacing*2
height: paddingItem.childrenRect.height + Units.smallSpacing * 2
property int implicitHeight: paddingItem.childrenRect.height + Units.smallSpacing*2
property int implicitHeight: paddingItem.childrenRect.height + Units.smallSpacing * 2
Rectangle {
@ -114,7 +113,7 @@ Item {
verticalCenter: parent.verticalCenter
rightMargin: y
}
height: Math.min( parent.height/1.5, Units.iconSizes.medium)
height: Math.min( parent.height / 1.5, Units.iconSizes.medium)
property bool exclusive: false
property Item checkedButton
spacing: 0
@ -151,10 +150,10 @@ Item {
}
InnerShadow {
anchors.fill: parent
radius: Units.smallSpacing*2
radius: Units.smallSpacing * 2
samples: 16
horizontalOffset: 0
verticalOffset: Units.smallSpacing/2
verticalOffset: Units.smallSpacing / 2
color: Qt.rgba(0, 0, 0, 0.3)
source: background
}
@ -162,7 +161,7 @@ Item {
id: shadow
//TODO: depends from app layout
property bool inverse: true
width: Units.smallSpacing*2
width: Units.smallSpacing * 2
anchors {
right: shadow.inverse ? undefined : itemMouse.left
left: shadow.inverse ? itemMouse.right : undefined
@ -210,7 +209,7 @@ Item {
id : item
color: listItem.checked || (itemMouse.pressed && itemMouse.changeBackgroundOnPress) ? Theme.highlightColor : Theme.viewBackgroundColor
anchors.fill: parent
visible: listItem.ListView.view ? listItem.ListView.view.highlight === null : true
Behavior on color {
ColorAnimation { duration: Units.longDuration }
@ -242,14 +241,14 @@ Item {
if (itemMouse.x > -itemMouse.width/2) {
itemMouse.x = 0;
} else {
itemMouse.x = -itemMouse.width + width*2
itemMouse.x = -itemMouse.width + width * 2
}
}
onClicked: {
if (itemMouse.x < -itemMouse.width/2) {
itemMouse.x = 0;
} else {
itemMouse.x = -itemMouse.width + width*2
itemMouse.x = -itemMouse.width + width * 2
}
}
Icon {