git.iko.soy/unity8
on xenial help sign in
Merge
commit0283d3aef08563b4c6b3439cd83d65c3198646a8 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 19 Feb 2016, 16:43 (11 years ago) parentad1a0449c4a0d3
3 files changed+4−2
compare with xenial
unifiedsplit
debian/control+1−1 qml/Dash/DashPageHeader.qml+1−1 qml/Dash/PageHeaderExtraPanel.qml+2
debian/control+1−1
@@ -29,7 +29,7 @@ Build-Depends: cmake,
2929 libqt5xmlpatterns5-dev,
3030 libsystemsettings-dev,
3131 libudev-dev,
32− libunity-api-dev (>= 7.106),
32+ libunity-api-dev (>= 7.107),
3333 libusermetricsoutput1-dev,
3434# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
3535 libx11-dev[!armhf],
qml/Dash/DashPageHeader.qml+1−1
@@ -257,7 +257,7 @@ Item {
257257 AbstractButton {
258258 id: settingsButton
259259
260− width: root.scopeHasFilters && clearButton.enabled ? height : 0
260+ width: root.scopeHasFilters ? height : 0
261261 visible: width > 0
262262 anchors {
263263 top: parent.top
qml/Dash/PageHeaderExtraPanel.qml+2
@@ -58,6 +58,7 @@ Item {
5858 top: parent.top
5959 left: parent.left
6060 margins: units.gu(2)
61+ topMargin: units.gu(3)
6162 }
6263 }
6364
@@ -69,6 +70,7 @@ Item {
6970 top: parent.top
7071 right: parent.right
7172 margins: units.gu(2)
73+ topMargin: units.gu(3)
7274 }
7375
7476 AbstractButton {