medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[app] Optimize BooksShelfItem

Browse source 
Use Loader to instantiate components on demand
This commit is contained in:
Slava Monich 2016-03-16 01:31:33 +02:00
parent cb4f35a0c1
commit 138e7f2068
1 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
app/qml/BooksShelfItem.qml
View file

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2015 Jolla Ltd. Copyright (C) 2015-2016 Jolla Ltd.
Contact: Slava Monich <slava.monich@jolla.com> Contact: Slava Monich <slava.monich@jolla.com>
You may use this file under the terms of BSD license as follows: You may use this file under the terms of BSD license as follows:
@ -46,7 +46,7 @@ Item {
property alias book: cover.book property alias book: cover.book
property alias synchronous: cover.synchronous property alias synchronous: cover.synchronous
property alias remorseTimeout: deleteAnimation.duration property alias remorseTimeout: deleteAnimation.duration
property alias copyProgress: progressIndicator.value property real copyProgress
property real margins: Theme.paddingMedium property real margins: Theme.paddingMedium
property real deleteAllOpacity: 1 property real deleteAllOpacity: 1
property bool editMode property bool editMode
@ -69,18 +69,26 @@ Item {
readonly property real _borderRadius: Theme.paddingSmall readonly property real _borderRadius: Theme.paddingSmall
readonly property color _borderColor: Theme.primaryColor readonly property color _borderColor: Theme.primaryColor
readonly property real _borderWidth: 2 readonly property real _borderWidth: 2
readonly property bool _haveProgress: copyProgress > 0 && copyProgress < 1
readonly property real _coverCenterX: cover.x + (cover.width - _deleteButtonSize)/2
readonly property real _coverCenterY: cover.y + cover.height - _deleteButtonSize/2
readonly property real _deleteButtonSize: 3*margins
readonly property real _deleteButtonMargin: Theme.paddingMedium
property bool scaledDown: (editMode && !dragged && !pressed && !dropped) property bool scaledDown: (editMode && !dragged && !pressed && !dropped)
Image { Loader {
active: !cover.book
anchors { anchors {
margins: root.margins margins: root.margins
fill: parent fill: parent
} }
visible: !cover.book sourceComponent: Image {
source: "images/bookshelf.svg" visible: !cover.book
sourceSize.width: width source: "images/bookshelf.svg"
sourceSize.height: height sourceSize.width: width
sourceSize.height: height
}
} }
BookCover { BookCover {
@ -127,23 +135,28 @@ Item {
onClicked: root.clicked() onClicked: root.clicked()
} }
BooksDeleteButton { Loader {
id: deleteButton id: deleteButton
x: cover.x + (cover.width - width)/2 active: editMode
y: cover.y + cover.height - height/2 sourceComponent: BooksDeleteButton {
size: 3*margins x: _coverCenterX
enabled: editMode && !pressed && !deleting && !deletingAll && !copyingIn && !copyingOut y: _coverCenterY
onClicked: root.deleteRequested() size: _deleteButtonSize
margin: _deleteButtonMargin
visible: !pressed && !deleting && !deletingAll && !copyingIn && !copyingOut
onClicked: root.deleteRequested()
}
} }
ProgressCircle { Loader {
id: progressIndicator active: copying && !longCopyTimer.running && _haveProgress
width: busyIndicator.width
height: width
anchors.centerIn: busyIndicator anchors.centerIn: busyIndicator
opacity: (copying && !longCopyTimer.running && value > 0 && value < 1) ? 1 : 0 sourceComponent: ProgressCircle {
visible: opacity > 0 value: copyProgress
Behavior on opacity { FadeAnimation {} } width: busyIndicator.width
height: width
inAlternateCycle: true
}
} }
BusyIndicator { BusyIndicator {
@ -152,15 +165,15 @@ Item {
x: cover.x + cover.centerX - width/2 x: cover.x + cover.centerX - width/2
y: cover.y + cover.centerY - height/2 y: cover.y + cover.centerY - height/2
visible: opacity > 0 visible: opacity > 0
running: copying && !longCopyTimer.running && (progressIndicator.value <= 0 || progressIndicator.value >= 1) running: copying && !longCopyTimer.running && !_haveProgress
Behavior on opacity { enabled: false } Behavior on opacity { enabled: false }
} }
function withinDeleteButton(x, y) { function withinDeleteButton(x, y) {
return x >= deleteButton.x - deleteButton.margin && return x >= _coverCenterX - _deleteButtonMargin &&
x < deleteButton.x + deleteButton.width + deleteButton.margin && x < _coverCenterX + _deleteButtonSize + _deleteButtonMargin &&
y >= deleteButton.y - deleteButton.margin && y >= _coverCenterY - _deleteButtonMargin &&
y < deleteButton.y + deleteButton.height + deleteButton.margin; y < _coverCenterY + _deleteButtonSize + _deleteButtonMargin
} }
function updateScaledDown() { function updateScaledDown() {