|
@@ -64,7 +64,7 @@ Item {
|
|
onFullChanged: {
|
|
onFullChanged: {
|
|
if (!initialized) {
|
|
if (!initialized) {
|
|
initialized = true
|
|
initialized = true
|
|
- globalVars.registerColumnPrimed()
|
|
|
|
|
|
+ globalUtil.registerColumnPrimed()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -83,7 +83,7 @@ Item {
|
|
image.y = root.height - compoundArtworkHeight
|
|
image.y = root.height - compoundArtworkHeight
|
|
|
|
|
|
pictureArray.push(image)
|
|
pictureArray.push(image)
|
|
- globalVars.itemCount++
|
|
|
|
|
|
+ globalUtil.itemCount++
|
|
}
|
|
}
|
|
|
|
|
|
function removeImage(image) {
|
|
function removeImage(image) {
|
|
@@ -91,7 +91,7 @@ Item {
|
|
image.effect.destroy()
|
|
image.effect.destroy()
|
|
}
|
|
}
|
|
image.destroy()
|
|
image.destroy()
|
|
- globalVars.itemCount--
|
|
|
|
|
|
+ globalUtil.itemCount--
|
|
}
|
|
}
|
|
|
|
|
|
function shift() {
|
|
function shift() {
|
|
@@ -120,14 +120,14 @@ Item {
|
|
id: deathTimer
|
|
id: deathTimer
|
|
running: !generalSettings.commonFeed && artworkStack.initialized
|
|
running: !generalSettings.commonFeed && artworkStack.initialized
|
|
repeat: true
|
|
repeat: true
|
|
- interval: globalVars.adjustedInterval
|
|
|
|
|
|
+ interval: globalUtil.adjustedInterval
|
|
onTriggered: artworkStack.shift()
|
|
onTriggered: artworkStack.shift()
|
|
}
|
|
}
|
|
|
|
|
|
Behavior on y {
|
|
Behavior on y {
|
|
enabled: artworkStack.initialized
|
|
enabled: artworkStack.initialized
|
|
NumberAnimation {
|
|
NumberAnimation {
|
|
- duration: Math.min(globalVars.adjustedInterval, basicSettings.animationDuration)
|
|
|
|
|
|
+ duration: Math.min(globalUtil.adjustedInterval, basicSettings.animationDuration)
|
|
easing.type: basicSettings.easingType
|
|
easing.type: basicSettings.easingType
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -143,14 +143,14 @@ Item {
|
|
|
|
|
|
Timer {
|
|
Timer {
|
|
id: globalDeathTimer
|
|
id: globalDeathTimer
|
|
- running: generalSettings.commonFeed && globalVars.primed
|
|
|
|
|
|
+ running: generalSettings.commonFeed && globalUtil.primed
|
|
repeat: true
|
|
repeat: true
|
|
- interval: globalVars.adjustedInterval
|
|
|
|
- onTriggered: d.columnArray[globalVars.columnSelection()].shift()
|
|
|
|
|
|
+ interval: globalUtil.adjustedInterval
|
|
|
|
+ onTriggered: d.columnArray[globalUtil.columnSelection()].shift()
|
|
}
|
|
}
|
|
|
|
|
|
Repeater {
|
|
Repeater {
|
|
- model: globalVars.columnCount
|
|
|
|
|
|
+ model: globalUtil.columnCount
|
|
delegate: columnComponent
|
|
delegate: columnComponent
|
|
onModelChanged: d.reset()
|
|
onModelChanged: d.reset()
|
|
}
|
|
}
|