on xenial help sign in
Design wants a bigger margin around Cancel
1997ab5Albert Astals Cid
qml/Dash/PageHeader.qml+5−2
@@ -204,7 +204,7 @@ Item {
204 bottom: parent.bottom
204 bottom: parent.bottom
205 bottomMargin: units.gu(1)
205 bottomMargin: units.gu(1)
206 right: cancelLabel.left
206 right: cancelLabel.left
207− rightMargin: units.gu(1)
207+ rightMargin: units.gu(2)
208 }
208 }
209
209
210 readonly property bool clearIsSettings: !searchTextField.focus && root.scopeHasFilters
210 readonly property bool clearIsSettings: !searchTextField.focus && root.scopeHasFilters
@@ -274,10 +274,13 @@ Item {
274 top: parent.top
274 top: parent.top
275 right: parent.right
275 right: parent.right
276 bottom: parent.bottom
276 bottom: parent.bottom
277− margins: units.gu(1)
277+ margins: units.gu(2)
278 }
278 }
279 AbstractButton {
279 AbstractButton {
280 anchors.fill: parent
280 anchors.fill: parent
281+ // So that clicking in the empty area on the left of Cancel
282+ // has the same effect as clicking on the empty area on the right
283+ anchors.leftMargin: units.gu(-2)
281 onClicked: {
284 onClicked: {
282 root.clearSearch(false);
285 root.clearSearch(false);
283 headerContainer.showSearch = false;
286 headerContainer.showSearch = false;