← Back to branch summary

~mterry/unity8/power-button-on-lock

« back to all changes in this revision

Viewing changes to qml/Stages/TabletStage.qml

  • Committer: Michael Terry
  • Date: 2014-11-24 15:25:42 UTC
  • mfrom: (1368.1.82 unity8)
  • Revision ID: michael.terry@canonical.com-20141124152542-5cysva8ds3qfula6
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Stages/TabletStage.qml
20
20
import Unity.Application 0.1
21
21
import Utils 0.1
22
22
import "../Components"
23
 
import "../Components/Flickables" as Flickables
24
23
 
25
24
Rectangle {
26
25
    id: root
27
26
    objectName: "stages"
28
27
    anchors.fill: parent
29
 
    color: "black"
 
28
    color: "#111111"
30
29
 
31
30
    // Controls to be set from outside
32
31
    property bool shown: false
154
153
        }
155
154
    }
156
155
 
157
 
    Flickables.Flickable {
 
156
    Flickable {
158
157
        id: spreadView
159
158
        anchors.fill: parent
160
159
        interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
386
385
            }
387
386
        }
388
387
 
389
 
        Item {
 
388
        MouseArea {
390
389
            id: spreadRow
391
390
            x: spreadView.contentX
392
391
            height: root.height
393
392
            width: spreadView.width + Math.max(spreadView.width, ApplicationManager.count * spreadView.tileDistance)
394
393
 
 
394
            onClicked: {
 
395
                spreadView.snapTo(0);
 
396
            }
 
397
 
395
398
            Rectangle {
396
399
                id: sideStageBackground
397
400
                color: "black"