~feng-kylin/unity8/fix-lp1413791

« back to all changes in this revision

Viewing changes to qml/Stages/TransformedTabletSpreadDelegate.qml

  • Committer: Michael Zanetti
  • Date: 2015-06-17 12:14:27 UTC
  • mfrom: (1595.1.214 unity8)
  • mto: (1595.1.232 unity8)
  • mto: This revision was merged to the branch mainline in revision 1608.
  • Revision ID: michael.zanetti@canonical.com-20150617121427-lgc70azrbtsanejb
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
50
50
    property int dragOffset: 0
51
51
 
52
52
    dropShadow: spreadView.active ||
53
 
                (active && model.stage == ApplicationInfoInterface.MainStage && priv.xTranslate != 0)
 
53
                (active
 
54
                 && (model.stage == ApplicationInfoInterface.MainStage || !priv.shellIsLandscape)
 
55
                 && priv.xTranslate != 0)
54
56
 
55
57
    onSelectedChanged: {
56
58
        if (selected) {
139
141
                     !snapAnimation.running &&
140
142
                     model.appId !== "unity8-dash" &&
141
143
                     !spreadView.sideStageDragging &&
142
 
                     spreadView.animateX
 
144
                     spreadView.animateX &&
 
145
                     !spreadView.beingResized
143
146
            UbuntuNumberAnimation {
144
147
                duration: UbuntuAnimation.FastDuration
145
148
            }