mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync with mobilecomponents 68c6dc9

Browse source 
This fixes spacing around the icon in the left drawer, the stretched-out
icons in the navigation menu, the unnecessary scrolling in the same
menu, and a few other things.

Signed-off-by: Sebastian Kügler <sebas@kde.org>
This commit is contained in:
Sebastian Kügler 2015-11-30 02:35:17 +01:00
parent 6381c2eb2a
commit f8fb9181b2
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qt-mobile/qml/mobilecomponents/GlobalDrawer.qml
View file

@ -84,7 +84,7 @@ OverlayDrawer {
anchors {
left: parent.left
top: parent.top
margins: Units.smallSpacing
margins: Units.smallSpacing * 2
}
Icon {
id: headingIcon
@ -140,6 +140,8 @@ OverlayDrawer {
model: actions
property int level: 0
interactive: contentHeight > height
footer: ListItem {
visible: level > 0
enabled: true
@ -149,7 +151,8 @@ OverlayDrawer {
left: parent.left
}
Icon {
Layout.maximumWidth: height
Layout.minimumWidth: height
Layout.maximumWidth: Layout.minimumWidth
Layout.fillHeight: true
source: "go-previous"
}
@ -179,7 +182,8 @@ OverlayDrawer {
text: modelData.text
}
Icon {
Layout.maximumWidth: height
Layout.minimumWidth: height
Layout.maximumWidth: Layout.minimumWidth
Layout.fillHeight: true
source: "go-next"
visible: modelData.children != undefined

20
qt-mobile/qml/mobilecomponents/private/ActionButton.qml
View file

@ -35,6 +35,15 @@ MouseArea {
minimumX: contextDrawer ? 0 : parent.width/2 - width/2
maximumX: globalDrawer ? parent.width : parent.width/2 - width/2
}
function toggle() {
showAnimation.running = false;
if (transform[0].y < button.height) {
showAnimation.to = button.height;
} else {
showAnimation.to = 0;
}
showAnimation.running = true;
}
transform: Translate {}
onReleased: {
@ -88,6 +97,13 @@ MouseArea {
}
}
NumberAnimation {
id: showAnimation
target: button.transform[0]
properties: "y"
duration: Units.longDuration
easing.type: Easing.InOutQuad
}
Item {
id: background
anchors {
@ -140,8 +156,8 @@ MouseArea {
DropShadow {
anchors.fill: background
horizontalOffset: 0
verticalOffset: Units.smallSpacing/2
radius: Units.gridUnit / 2.4
verticalOffset: Units.smallSpacing/3
radius: Units.gridUnit / 3.5
samples: 16
color: button.pressed ? "transparent" : Qt.rgba(0, 0, 0, 0.5)
source: background