@@ -87,10 +87,15 @@ Item {
8787 anchors {
8888 verticalCenter: parent.verticalCenter
8989 left: backImage.right
90+ right: parent.right
9091 leftMargin: units.gu(0.5)
92+ rightMargin: units.gu(2)
9193 }
9294 text: navigation ? navigation.parentLabel : ""
9395 color: root.foregroundColor
96+ wrapMode: Text.Wrap
97+ maximumLineCount: 2
98+ elide: Text.ElideMiddle
9499 }
95100
96101 Rectangle {
@@ -118,11 +123,16 @@ Item {
118123 anchors {
119124 verticalCenter: parent.verticalCenter
120125 left: parent.left
126+ right: parent.right
121127 leftMargin: units.gu(2)
128+ rightMargin: units.gu(2)
122129 }
123130 text: navigation ? (navigation.allLabel != "" ? navigation.allLabel : navigation.label) : ""
124131 font.bold: true
125132 color: root.foregroundColor
133+ wrapMode: Text.Wrap
134+ maximumLineCount: 2
135+ elide: Text.ElideMiddle
126136 }
127137
128138 Rectangle {
@@ -156,12 +166,18 @@ Item {
156166 verticalCenter: parent.verticalCenter
157167 left: parent.left
158168 leftMargin: units.gu(2)
169+ right: rightIcon.visible ? rightIcon.left : parent.right
170+ rightMargin: rightIcon.visible ? units.gu(0.5) : units.gu(2)
159171 }
160172 text: label
161173 color: root.foregroundColor
174+ wrapMode: Text.Wrap
175+ maximumLineCount: 2
176+ elide: Text.ElideMiddle
162177 }
163178
164179 Icon {
180+ id: rightIcon
165181 anchors {
166182 verticalCenter: parent.verticalCenter
167183 right: parent.right