git.iko.soy/unity8
on xenial help sign in
Don't use a Row element.
75729fdMirco Müller
qml/Notifications/Notification.qml+31−33
compare with xenial
unifiedsplit
@@ -333,7 +333,7 @@ Item {
333 gradient: darkgreyGradient
333 gradient: darkgreyGradient
334 onClicked: print ("Clicked on " + text)
334 onClicked: print ("Clicked on " + text)
335 expanded: false
335 expanded: false
336− expandedHeight: (actionRepeater.count - 2) * units.gu(4) + units.gu(4.5)
336+ expandedHeight: (actionRepeater.count) * units.gu(4)
337 comboList: ListView {
337 comboList: ListView {
338 id: myView
338 id: myView
339
339
@@ -351,42 +351,40 @@ Item {
351 }
351 }
352
352
353 MouseArea {
353 MouseArea {
354− x: delegateRow.x
354+ id: localInputArea
355− y: delegateRow.y
355+
356+ x: localIcon.x
357+ y: localIcon.y
356− width: delegateRow.width
358+ width: parent.width
357− height: delegateRow.height
359+ height: localIcon.height + units.gu(1)
358
360
359 onClicked: {
361 onClicked: {
360− print ("Clicked on: " + label)
362+ notification.notification.invokeAction(id)
363+ }
364+
365+ Icon {
366+ id: localIcon
367+
368+ anchors.left: parent.left
369+ anchors.leftMargin: units.gu(.5)
370+ anchors.top: parent.top
371+ anchors.topMargin: units.gu(.5)
372+ width: units.gu(2)
373+ height: units.gu(2)
374+ name: "messages"
375+ color: "white"
361 }
376 }
362
377
363− Row {
364− id: delegateRow
365− /*Rectangle {
366− id: frame
367−
368− color: Qt.rgba(0.0, 0.0, 0.0, 0.0)
369− width: myDelegate.height
370− height: width
371−
372− Icon {
373− anchors.fill: parent
374− anchors.margins: units.gu(1)
375− width: units.gu(3)
376− height: units.gu(3)
377− name: icon
378− color: "white"
379− }
380− }*/
381−
382− Label {
378+ Label {
383− //height: frame.height
379+ id: localLabel
384− height: units.gu(3)
380+
381+ anchors.left: localIcon.right
382+ anchors.leftMargin: units.gu(.5)
383+ height: localIcon.height
385− verticalAlignment: Text.AlignVCenter
384+ verticalAlignment: Text.AlignVCenter
386− fontSize: "small"
385+ fontSize: "small"
387− color: "white"
386+ color: "white"
388− text: label
387+ text: label
389− }
390 }
388 }
391 }
389 }
392 }
390 }