Commit 976552d8 authored by Marco Martin's avatar Marco Martin

Merge branch 'mart/containmentPreview'

parents f223399c 3a959241
...@@ -25,7 +25,7 @@ Item { ...@@ -25,7 +25,7 @@ Item {
property string shell : "org.kde.plasma.phone" property string shell : "org.kde.plasma.phone"
property bool willing : true property bool willing : true
property int priority : currentSession == "plasma-mobile" ? 0 : 10 property int priority : 10
// This is not needed, but allows the // This is not needed, but allows the
// handler to know whether its shell is loaded // handler to know whether its shell is loaded
......
...@@ -33,6 +33,7 @@ MouseArea { ...@@ -33,6 +33,7 @@ MouseArea {
right: handle.mirrored ? parent.right : undefined right: handle.mirrored ? parent.right : undefined
left: handle.mirrored ? undefined : parent.left left: handle.mirrored ? undefined : parent.left
} }
property Item frame: nextActivityLabel
width: units.gridUnit width: units.gridUnit
drag.target: nextActivityLabel drag.target: nextActivityLabel
drag.axis: Drag.XAxis drag.axis: Drag.XAxis
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment