git.iko.soy/unity8
on xenial help sign in
Merge
ad1a044Albert Astals Cid
qml/Dash/DashPageHeader.qml+37−40
compare with xenial
unifiedsplit
@@ -200,12 +200,10 @@ Item {
200 left: parent.left
200 left: parent.left
201 bottom: parent.bottom
201 bottom: parent.bottom
202 bottomMargin: units.gu(1)
202 bottomMargin: units.gu(1)
203− right: cancelLabel.left
203+ right: settingsButton.left
204− rightMargin: units.gu(2)
204+ rightMargin: settingsButton.visible ? 0 : units.gu(2)
205 }
205 }
206
206
207− readonly property bool clearIsSettings: !searchTextField.focus && root.scopeHasFilters
208−
209 primaryItem: Rectangle {
207 primaryItem: Rectangle {
210 color: "#F5F4F5"
208 color: "#F5F4F5"
211 width: root.navigationTag != "" ? tagLabel.width + units.gu(2) : 0
209 width: root.navigationTag != "" ? tagLabel.width + units.gu(2) : 0
@@ -220,49 +218,25 @@ Item {
220 }
218 }
221
219
222 secondaryItem: AbstractButton {
220 secondaryItem: AbstractButton {
223− id: clearOrSettingsButton
221+ id: clearButton
224−
225 height: searchTextField.height
222 height: searchTextField.height
226− width: row.width
223+ width: height
227−
228 enabled: searchTextField.text.length > 0 || root.navigationTag != ""
224 enabled: searchTextField.text.length > 0 || root.navigationTag != ""
229
225
230− Row {
231− id: row
232− height: parent.height
233−
234− Item {
235− height: parent.height
236− width: height
237−
238− Image {
226+ Image {
227+ objectName: "clearIcon"
239− anchors.fill: parent
228+ anchors.fill: parent
240− anchors.margins: units.gu(1)
229+ anchors.margins: units.gu(1)
241−
242− objectName: "clearIcon"
243− source: searchTextField.clearIsSettings ? "image://theme/filters" : "image://theme/clear"
230+ source: "image://theme/clear"
244− opacity: parent.enabled
231+ opacity: parent.enabled
245− visible: opacity > 0
232+ visible: opacity > 0
246− Behavior on opacity {
233+ Behavior on opacity {
247− UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
234+ UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
248− }
249− }
250− }
251−
252− Label {
253− visible: searchTextField.clearIsSettings && root.activeFiltersCount > 0
254− height: parent.height
255− text: "(" + root.activeFiltersCount + ")"
256− verticalAlignment: Text.AlignVCenter
257 }
235 }
258 }
236 }
259
237
260 onClicked: {
238 onClicked: {
261− if (searchTextField.clearIsSettings) {
262− root.showFiltersPopup(clearOrSettingsButton);
263− } else {
264− root.clearSearch(true);
239+ root.clearSearch(true);
265− }
266 }
240 }
267 }
241 }
268
242
@@ -280,6 +254,29 @@ Item {
280 }
254 }
281 }
255 }
282
256
257+ AbstractButton {
258+ id: settingsButton
259+
260+ width: root.scopeHasFilters && clearButton.enabled ? height : 0
261+ visible: width > 0
262+ anchors {
263+ top: parent.top
264+ right: cancelLabel.left
265+ bottom: parent.bottom
266+ }
267+
268+ Icon {
269+ anchors.fill: parent
270+ anchors.margins: units.gu(2)
271+ name: "filters"
272+ color: root.activeFiltersCount > 0 ? UbuntuColors.orange : Qt.rgba(0.0, 0.0, 0.0, 0.0)
273+ }
274+
275+ onClicked: {
276+ root.showFiltersPopup(settingsButton);
277+ }
278+ }
279+
283 Label {
280 Label {
284 id: cancelLabel
281 id: cancelLabel
285 text: i18n.tr("Cancel")
282 text: i18n.tr("Cancel")