git.iko.soy/unity8
on xenial help sign in
Merge
0283d3aAlbert Astals Cid
debian/control+1−1
compare with xenial
unifiedsplit
@@ -29,7 +29,7 @@ Build-Depends: cmake,
29 libqt5xmlpatterns5-dev,
29 libqt5xmlpatterns5-dev,
30 libsystemsettings-dev,
30 libsystemsettings-dev,
31 libudev-dev,
31 libudev-dev,
32− libunity-api-dev (>= 7.106),
32+ libunity-api-dev (>= 7.107),
33 libusermetricsoutput1-dev,
33 libusermetricsoutput1-dev,
34# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
34# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
35 libx11-dev[!armhf],
35 libx11-dev[!armhf],
qml/Dash/DashPageHeader.qml+1−1
@@ -257,7 +257,7 @@ Item {
257 AbstractButton {
257 AbstractButton {
258 id: settingsButton
258 id: settingsButton
259
259
260− width: root.scopeHasFilters && clearButton.enabled ? height : 0
260+ width: root.scopeHasFilters ? height : 0
261 visible: width > 0
261 visible: width > 0
262 anchors {
262 anchors {
263 top: parent.top
263 top: parent.top
qml/Dash/PageHeaderExtraPanel.qml+2
@@ -58,6 +58,7 @@ Item {
58 top: parent.top
58 top: parent.top
59 left: parent.left
59 left: parent.left
60 margins: units.gu(2)
60 margins: units.gu(2)
61+ topMargin: units.gu(3)
61 }
62 }
62 }
63 }
63
64
@@ -69,6 +70,7 @@ Item {
69 top: parent.top
70 top: parent.top
70 right: parent.right
71 right: parent.right
71 margins: units.gu(2)
72 margins: units.gu(2)
73+ topMargin: units.gu(3)
72 }
74 }
73
75
74 AbstractButton {
76 AbstractButton {