Merge trunk.
commit9206b3f0629f2dfefe096b9ddad91770b3c43846
authorMichał Sawicz <michal.sawicz@canonical.com>
dateFri 21 Feb 2014, 19:25 (13 years ago)
parentf56dce41dcb2dd
debian/changelog+12
@@ -1,3 +1,15 @@
1+unity8 (7.84+14.04.20140221-0ubuntu1) trusty; urgency=low
2+
3+ [ Michał Sawicz ]
4+ * Add card background support.
5+ * Increase the sidestage threshold.
6+
7+ [ Jussi Pakkanen ]
8+ * Move downloads to their own threads so they don't muck about with
9+ the parent thread's event loop. (LP: #1240408)
10+
11+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 21 Feb 2014 09:06:04 +0000
12+
113unity8 (7.84+14.04.20140218-0ubuntu1) trusty; urgency=low
214
315 [ Michał Sawicz ]
qml/Dash/Card.qml+1−1
@@ -25,7 +25,7 @@ AbstractButton {
2525
2626 property alias fontScale: header.fontScale
2727 property alias headerAlignment: header.headerAlignment
28− property alias headerHeight: header.height
28+ readonly property alias headerHeight: header.height
2929
3030 property bool showHeader: true
3131
qml/Greeter/Greeter.qml+1−1
@@ -37,7 +37,7 @@ Showable {
3737 property alias model: greeterContentLoader.model
3838 property bool locked: shown && !LightDM.Greeter.promptless
3939
40− readonly property bool narrowMode: !multiUser && width <= units.gu(60)
40+ readonly property bool narrowMode: !multiUser && height > width
4141 readonly property bool multiUser: LightDM.Users.count > 1
4242
4343 readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready &&
qml/Shell.qml+1−1
@@ -358,7 +358,7 @@ FocusScope {
358358 }
359359 }
360360
361− enabled: shell.width >= units.gu(60)
361+ enabled: shell.width >= units.gu(100)
362362 visible: enabled
363363 fullyShown: stages.fullyShown && shown
364364 && sideStage[sideStageRevealer.boundProperty] == sideStageRevealer.openedValue