Merge lp:~bzoltan/ubuntu-ui-toolkit/landing-06-08 into lp:ubuntu-ui-toolkit
- landing-06-08
- Merge into trunk
Proposed by
Zoltan Balogh
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 1183 |
Merged at revision: | 1068 |
Proposed branch: | lp:~bzoltan/ubuntu-ui-toolkit/landing-06-08 |
Merge into: | lp:ubuntu-ui-toolkit |
Diff against target: |
358 lines (+124/-19) 13 files modified
debian/changelog (+13/-0) modules/Ubuntu/Components/ListItems/Standard.qml (+1/-1) modules/Ubuntu/Components/Popups/Popover.qml (+2/-1) modules/Ubuntu/Components/Tabs.qml (+1/-1) modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml (+9/-5) modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml (+22/-0) modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+66/-6) modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml (+1/-0) modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.sci (+5/-0) modules/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-0) modules/Ubuntu/Components/plugin/shapeitem.cpp (+1/-1) tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+2/-3) tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py (+0/-1) |
To merge this branch: | bzr merge lp:~bzoltan/ubuntu-ui-toolkit/landing-06-08 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cris Dywan | Pending | ||
Review via email: mp+229826@code.launchpad.net |
Commit message
- Ubuntu Shape: store geometry before redrawing can occur so that the geometry is more reliably respected. Fixes: https:/
- Square overflow panel style for header pop overs. Fixes: https:/
Description of the change
- Ubuntu Shape: store geometry before redrawing can occur so that the geometry is more reliably respected. Fixes: https:/
- Square overflow panel style for header pop overs. Fixes: https:/
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2014-08-04 16:00:57 +0000 | |||
3 | +++ debian/changelog 2014-08-06 16:32:29 +0000 | |||
4 | @@ -1,3 +1,16 @@ | |||
5 | 1 | ubuntu-ui-toolkit (1.1.1181+14.10.20140804-0ubuntu2) UNRELEASED; urgency=medium | ||
6 | 2 | |||
7 | 3 | [ Florian Boucault ] | ||
8 | 4 | * Ubuntu Shape: store geometry before redrawing can occur so that | ||
9 | 5 | the geometry is more reliably respected. | ||
10 | 6 | Fixes: https://bugs.launchpad.net/bugs/1353493 | ||
11 | 7 | |||
12 | 8 | [ Christian Dywan ] | ||
13 | 9 | * Square overflow panel style for header pop overs. | ||
14 | 10 | Fixes: https://bugs.launchpad.net/bugs/1336789 | ||
15 | 11 | |||
16 | 12 | -- Zoltán Balogh <zoltan@bakter.hu> Wed, 06 Aug 2014 19:26:17 +0300 | ||
17 | 13 | |||
18 | 1 | ubuntu-ui-toolkit (1.1.1179+14.10.20140804-0ubuntu1) utopic; urgency=medium | 14 | ubuntu-ui-toolkit (1.1.1179+14.10.20140804-0ubuntu1) utopic; urgency=medium |
19 | 2 | 15 | ||
20 | 3 | [ Florian Boucault ] | 16 | [ Florian Boucault ] |
21 | 4 | 17 | ||
22 | === modified file 'modules/Ubuntu/Components/ListItems/Standard.qml' | |||
23 | --- modules/Ubuntu/Components/ListItems/Standard.qml 2014-05-22 22:56:16 +0000 | |||
24 | +++ modules/Ubuntu/Components/ListItems/Standard.qml 2014-08-06 16:32:29 +0000 | |||
25 | @@ -197,7 +197,7 @@ | |||
26 | 197 | id: iconHelper | 197 | id: iconHelper |
27 | 198 | 198 | ||
28 | 199 | width: height | 199 | width: height |
30 | 200 | height: Math.min(units.gu(5), parent.height - units.gu(1)) | 200 | height: Math.min(units.gu(5), listItem.height - units.gu(1)) |
31 | 201 | anchors { | 201 | anchors { |
32 | 202 | left: parent.left | 202 | left: parent.left |
33 | 203 | leftMargin: listItem.__contentsMargins | 203 | leftMargin: listItem.__contentsMargins |
34 | 204 | 204 | ||
35 | === modified file 'modules/Ubuntu/Components/Popups/Popover.qml' | |||
36 | --- modules/Ubuntu/Components/Popups/Popover.qml 2014-04-25 15:14:18 +0000 | |||
37 | +++ modules/Ubuntu/Components/Popups/Popover.qml 2014-08-06 16:32:29 +0000 | |||
38 | @@ -127,7 +127,7 @@ | |||
39 | 127 | The property holds the margins from the popover's dismissArea. The property | 127 | The property holds the margins from the popover's dismissArea. The property |
40 | 128 | is themed. | 128 | is themed. |
41 | 129 | */ | 129 | */ |
43 | 130 | property real edgeMargins: units.gu(2) | 130 | property real edgeMargins: foreground.square ? 0 : units.gu(2) |
44 | 131 | 131 | ||
45 | 132 | /*! | 132 | /*! |
46 | 133 | The property holds the margin from the popover's caller. The property | 133 | The property holds the margin from the popover's caller. The property |
47 | @@ -231,6 +231,7 @@ | |||
48 | 231 | property point target: Qt.point(pointer.x - x, pointer.y - y) | 231 | property point target: Qt.point(pointer.x - x, pointer.y - y) |
49 | 232 | property string direction: pointer.direction | 232 | property string direction: pointer.direction |
50 | 233 | property bool clipContent: true | 233 | property bool clipContent: true |
51 | 234 | property bool square: popover.hasOwnProperty("square") ? popover.square : false | ||
52 | 234 | 235 | ||
53 | 235 | signal show() | 236 | signal show() |
54 | 236 | signal hide() | 237 | signal hide() |
55 | 237 | 238 | ||
56 | === modified file 'modules/Ubuntu/Components/Tabs.qml' | |||
57 | --- modules/Ubuntu/Components/Tabs.qml 2014-06-18 11:49:29 +0000 | |||
58 | +++ modules/Ubuntu/Components/Tabs.qml 2014-08-06 16:32:29 +0000 | |||
59 | @@ -338,7 +338,7 @@ | |||
60 | 338 | function connectToRepeaters(children) { | 338 | function connectToRepeaters(children) { |
61 | 339 | for (var i = 0; i < children.length; i++) { | 339 | for (var i = 0; i < children.length; i++) { |
62 | 340 | var child = children[i]; | 340 | var child = children[i]; |
64 | 341 | if (internal.isRepeater(child) && (internal.repeaters.indexOf(child) < 0)) { | 341 | if (internal.isRepeater(child) && internal.repeaters && (internal.repeaters.indexOf(child) < 0)) { |
65 | 342 | internal.connectRepeater(child); | 342 | internal.connectRepeater(child); |
66 | 343 | } | 343 | } |
67 | 344 | } | 344 | } |
68 | 345 | 345 | ||
69 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml' | |||
70 | --- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml 2014-05-07 18:06:41 +0000 | |||
71 | +++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml 2014-08-06 16:32:29 +0000 | |||
72 | @@ -29,6 +29,7 @@ | |||
73 | 29 | // FIXME: This should not be necessary. See | 29 | // FIXME: This should not be necessary. See |
74 | 30 | // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1214978 | 30 | // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1214978 |
75 | 31 | property alias arrowSource: arrow.source | 31 | property alias arrowSource: arrow.source |
76 | 32 | property bool square: false | ||
77 | 32 | 33 | ||
78 | 33 | implicitWidth: units.gu(10) | 34 | implicitWidth: units.gu(10) |
79 | 34 | implicitHeight: units.gu(8) | 35 | implicitHeight: units.gu(8) |
80 | @@ -94,8 +95,10 @@ | |||
81 | 94 | BorderImage { | 95 | BorderImage { |
82 | 95 | id: shadow | 96 | id: shadow |
83 | 96 | anchors.fill: parent | 97 | anchors.fill: parent |
86 | 97 | anchors.margins: -units.gu(0.5) | 98 | anchors.margins: square ? -units.gu(1) : -units.gu(0.5) |
87 | 98 | source: "artwork/bubble_shadow.sci" | 99 | anchors.topMargin: square ? 0 : anchors.margins |
88 | 100 | source: !square ? "artwork/bubble_shadow.sci" : "artwork/header_overflow_dropshadow.sci" | ||
89 | 101 | opacity: 0.8 | ||
90 | 99 | } | 102 | } |
91 | 100 | 103 | ||
92 | 101 | UbuntuShape { | 104 | UbuntuShape { |
93 | @@ -103,13 +106,14 @@ | |||
94 | 103 | borderSource: "none" | 106 | borderSource: "none" |
95 | 104 | color: Theme.palette.normal.overlay | 107 | color: Theme.palette.normal.overlay |
96 | 105 | image: bubbleShape.clipContent ? shapeSource : null | 108 | image: bubbleShape.clipContent ? shapeSource : null |
97 | 109 | visible: !square | ||
98 | 106 | } | 110 | } |
99 | 107 | 111 | ||
100 | 108 | ShaderEffectSource { | 112 | ShaderEffectSource { |
101 | 109 | id: shapeSource | 113 | id: shapeSource |
102 | 110 | visible: bubbleShape.clipContent | 114 | visible: bubbleShape.clipContent |
103 | 111 | sourceItem: bubbleShape.clipContent ? content : null | 115 | sourceItem: bubbleShape.clipContent ? content : null |
105 | 112 | hideSource: true | 116 | hideSource: !square |
106 | 113 | // FIXME: visible: false prevents rendering so make it a nearly | 117 | // FIXME: visible: false prevents rendering so make it a nearly |
107 | 114 | // transparent 1x1 pixel instead | 118 | // transparent 1x1 pixel instead |
108 | 115 | opacity: 0.01 | 119 | opacity: 0.01 |
109 | @@ -124,7 +128,7 @@ | |||
110 | 124 | Rectangle { | 128 | Rectangle { |
111 | 125 | id: colorRect | 129 | id: colorRect |
112 | 126 | anchors.fill: parent | 130 | anchors.fill: parent |
114 | 127 | color: Theme.palette.normal.overlay | 131 | color: square ? Theme.palette.normal.background : Theme.palette.normal.overlay |
115 | 128 | visible: bubbleShape.clipContent | 132 | visible: bubbleShape.clipContent |
116 | 129 | } | 133 | } |
117 | 130 | } | 134 | } |
118 | @@ -136,7 +140,7 @@ | |||
119 | 136 | Image { | 140 | Image { |
120 | 137 | id: arrow | 141 | id: arrow |
121 | 138 | 142 | ||
123 | 139 | visible: bubbleShape.direction != "none" | 143 | visible: !square && bubbleShape.direction != "none" |
124 | 140 | 144 | ||
125 | 141 | function directionToRotation(direction) { | 145 | function directionToRotation(direction) { |
126 | 142 | switch (direction) { | 146 | switch (direction) { |
127 | 143 | 147 | ||
128 | === added file 'modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml' | |||
129 | --- modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml 1970-01-01 00:00:00 +0000 | |||
130 | +++ modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml 2014-08-06 16:32:29 +0000 | |||
131 | @@ -0,0 +1,22 @@ | |||
132 | 1 | /* | ||
133 | 2 | * Copyright 2014 Canonical Ltd. | ||
134 | 3 | * | ||
135 | 4 | * This program is free software; you can redistribute it and/or modify | ||
136 | 5 | * it under the terms of the GNU Lesser General Public License as published by | ||
137 | 6 | * the Free Software Foundation; version 3. | ||
138 | 7 | * | ||
139 | 8 | * This program is distributed in the hope that it will be useful, | ||
140 | 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
141 | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
142 | 11 | * GNU Lesser General Public License for more details. | ||
143 | 12 | * | ||
144 | 13 | * You should have received a copy of the GNU Lesser General Public License | ||
145 | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
146 | 15 | */ | ||
147 | 16 | |||
148 | 17 | import QtQuick 2.0 | ||
149 | 18 | import Ubuntu.Components.Popups 1.0 | ||
150 | 19 | |||
151 | 20 | Popover { | ||
152 | 21 | property bool square: true | ||
153 | 22 | } | ||
154 | 0 | 23 | ||
155 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml' | |||
156 | --- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2014-07-31 14:09:45 +0000 | |||
157 | +++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml 2014-08-06 16:32:29 +0000 | |||
158 | @@ -161,11 +161,14 @@ | |||
159 | 161 | tabsPopover.show(); | 161 | tabsPopover.show(); |
160 | 162 | } | 162 | } |
161 | 163 | 163 | ||
163 | 164 | Popover { | 164 | OverflowPanel { |
164 | 165 | id: tabsPopover | 165 | id: tabsPopover |
165 | 166 | objectName: "tabsPopover" | 166 | objectName: "tabsPopover" |
166 | 167 | parent: QuickUtils.rootItem(tabsPopover) | 167 | parent: QuickUtils.rootItem(tabsPopover) |
167 | 168 | caller: tabsButton | 168 | caller: tabsButton |
168 | 169 | callerMargin: -units.gu(1) + units.dp(4) | ||
169 | 170 | contentWidth: units.gu(20) | ||
170 | 171 | |||
171 | 169 | Column { | 172 | Column { |
172 | 170 | anchors { | 173 | anchors { |
173 | 171 | left: parent.left | 174 | left: parent.left |
174 | @@ -174,14 +177,33 @@ | |||
175 | 174 | } | 177 | } |
176 | 175 | Repeater { | 178 | Repeater { |
177 | 176 | model: styledItem.tabsModel | 179 | model: styledItem.tabsModel |
181 | 177 | ListItem.Standard { | 180 | AbstractButton { |
179 | 178 | visible: index !== styledItem.tabsModel.selectedIndex | ||
180 | 179 | text: tab.title // FIXME: only "title" doesn't work with i18n.tr(). Why not? | ||
182 | 180 | objectName: "tabButton" + index | 181 | objectName: "tabButton" + index |
183 | 181 | onClicked: { | 182 | onClicked: { |
184 | 182 | styledItem.tabsModel.selectedIndex = index; | 183 | styledItem.tabsModel.selectedIndex = index; |
185 | 183 | tabsPopover.hide(); | 184 | tabsPopover.hide(); |
186 | 184 | } | 185 | } |
187 | 186 | implicitHeight: units.gu(6) + bottomDividerLine.height | ||
188 | 187 | width: parent ? parent.width : units.gu(31) | ||
189 | 188 | |||
190 | 189 | Label { | ||
191 | 190 | anchors { | ||
192 | 191 | verticalCenter: parent.verticalCenter | ||
193 | 192 | verticalCenterOffset: units.dp(-1) | ||
194 | 193 | left: parent.left | ||
195 | 194 | leftMargin: units.gu(2) | ||
196 | 195 | } | ||
197 | 196 | fontSize: "medium" | ||
198 | 197 | elide: Text.ElideRight | ||
199 | 198 | text: tab.title // FIXME: only "title" doesn't work with i18n.tr(). Why not? | ||
200 | 199 | color: '#5d5d5d' | ||
201 | 200 | } | ||
202 | 201 | |||
203 | 202 | ListItem.ThinDivider { | ||
204 | 203 | id: bottomDividerLine | ||
205 | 204 | anchors.bottom: parent.bottom | ||
206 | 205 | visible: index < styledItem.tabsModel.count - 1 | ||
207 | 206 | } | ||
208 | 185 | } | 207 | } |
209 | 186 | } | 208 | } |
210 | 187 | } | 209 | } |
211 | @@ -296,11 +318,13 @@ | |||
212 | 296 | height: actionsContainer.height | 318 | height: actionsContainer.height |
213 | 297 | onTriggered: actionsOverflowPopover.show() | 319 | onTriggered: actionsOverflowPopover.show() |
214 | 298 | 320 | ||
216 | 299 | Popover { | 321 | OverflowPanel { |
217 | 300 | id: actionsOverflowPopover | 322 | id: actionsOverflowPopover |
218 | 301 | objectName: "actions_overflow_popover" | 323 | objectName: "actions_overflow_popover" |
219 | 302 | parent: QuickUtils.rootItem(actionsOverflowPopover) | 324 | parent: QuickUtils.rootItem(actionsOverflowPopover) |
220 | 303 | caller: actionsOverflowButton | 325 | caller: actionsOverflowButton |
221 | 326 | callerMargin: -units.gu(1) + units.dp(4) | ||
222 | 327 | contentWidth: units.gu(20) | ||
223 | 304 | 328 | ||
224 | 305 | // Ensure the popover closes when actions change and | 329 | // Ensure the popover closes when actions change and |
225 | 306 | // the list item below may be destroyed before its | 330 | // the list item below may be destroyed before its |
226 | @@ -326,11 +350,47 @@ | |||
227 | 326 | right: parent.right | 350 | right: parent.right |
228 | 327 | } | 351 | } |
229 | 328 | Repeater { | 352 | Repeater { |
230 | 353 | id: overflowRepeater | ||
231 | 329 | model: numberOfSlots.requested - numberOfSlots.used | 354 | model: numberOfSlots.requested - numberOfSlots.used |
233 | 330 | ListItem.Standard { | 355 | AbstractButton { |
234 | 331 | action: actionsContainer.visibleActions[numberOfSlots.used + index] | 356 | action: actionsContainer.visibleActions[numberOfSlots.used + index] |
235 | 332 | objectName: action.objectName + "_header_overflow_button" | 357 | objectName: action.objectName + "_header_overflow_button" |
236 | 333 | onClicked: actionsOverflowPopover.hide() | 358 | onClicked: actionsOverflowPopover.hide() |
237 | 359 | implicitHeight: units.gu(6) + bottomDividerLine.height | ||
238 | 360 | width: parent ? parent.width : units.gu(31) | ||
239 | 361 | |||
240 | 362 | Icon { | ||
241 | 363 | id: actionIcon | ||
242 | 364 | name: action.iconName | ||
243 | 365 | color: '#5d5d5d' | ||
244 | 366 | anchors { | ||
245 | 367 | verticalCenter: parent.verticalCenter | ||
246 | 368 | verticalCenterOffset: units.dp(-1) | ||
247 | 369 | left: parent.left | ||
248 | 370 | leftMargin: units.gu(2) | ||
249 | 371 | } | ||
250 | 372 | width: units.gu(2) | ||
251 | 373 | height: units.gu(2) | ||
252 | 374 | } | ||
253 | 375 | |||
254 | 376 | Label { | ||
255 | 377 | anchors { | ||
256 | 378 | verticalCenter: parent.verticalCenter | ||
257 | 379 | verticalCenterOffset: units.dp(-1) | ||
258 | 380 | left: actionIcon.right | ||
259 | 381 | leftMargin: units.gu(2) | ||
260 | 382 | } | ||
261 | 383 | fontSize: "small" | ||
262 | 384 | elide: Text.ElideRight | ||
263 | 385 | text: action.text | ||
264 | 386 | color: '#5d5d5d' | ||
265 | 387 | } | ||
266 | 388 | |||
267 | 389 | ListItem.ThinDivider { | ||
268 | 390 | id: bottomDividerLine | ||
269 | 391 | anchors.bottom: parent.bottom | ||
270 | 392 | visible: index !== overflowRepeater.count - 1 | ||
271 | 393 | } | ||
272 | 334 | } | 394 | } |
273 | 335 | } | 395 | } |
274 | 336 | } | 396 | } |
275 | 337 | 397 | ||
276 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml' | |||
277 | --- modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml 2013-07-31 12:16:52 +0000 | |||
278 | +++ modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml 2014-08-06 16:32:29 +0000 | |||
279 | @@ -22,6 +22,7 @@ | |||
280 | 22 | target: styledItem.target | 22 | target: styledItem.target |
281 | 23 | direction: styledItem.direction | 23 | direction: styledItem.direction |
282 | 24 | clipContent: styledItem.clipContent | 24 | clipContent: styledItem.clipContent |
283 | 25 | square: styledItem.square | ||
284 | 25 | 26 | ||
285 | 26 | onShowCompleted: styledItem.showCompleted() | 27 | onShowCompleted: styledItem.showCompleted() |
286 | 27 | onHideCompleted: styledItem.hideCompleted() | 28 | onHideCompleted: styledItem.hideCompleted() |
287 | 28 | 29 | ||
288 | === added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.png' | |||
289 | 29 | Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.png 1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.png 2014-08-06 16:32:29 +0000 differ | 30 | Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.png 1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.png 2014-08-06 16:32:29 +0000 differ |
290 | === added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.sci' | |||
291 | --- modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.sci 1970-01-01 00:00:00 +0000 | |||
292 | +++ modules/Ubuntu/Components/Themes/Ambiance/artwork/header_overflow_dropshadow@27.sci 2014-08-06 16:32:29 +0000 | |||
293 | @@ -0,0 +1,5 @@ | |||
294 | 1 | border.left: 27 | ||
295 | 2 | border.top: 27 | ||
296 | 3 | border.bottom: 27 | ||
297 | 4 | border.right: 27 | ||
298 | 5 | source: header_overflow_dropshadow@27.png | ||
299 | 0 | \ No newline at end of file | 6 | \ No newline at end of file |
300 | 1 | 7 | ||
301 | === modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir' | |||
302 | --- modules/Ubuntu/Components/Themes/Ambiance/qmldir 2014-07-22 14:20:08 +0000 | |||
303 | +++ modules/Ubuntu/Components/Themes/Ambiance/qmldir 2014-08-06 16:32:29 +0000 | |||
304 | @@ -49,3 +49,4 @@ | |||
305 | 49 | 49 | ||
306 | 50 | internal TextSelectionStartCursorStyle TextSelectionStartCursorStyle.qml | 50 | internal TextSelectionStartCursorStyle TextSelectionStartCursorStyle.qml |
307 | 51 | internal TextSelectionEndCursorStyle TextSelectionEndCursorStyle.qml | 51 | internal TextSelectionEndCursorStyle TextSelectionEndCursorStyle.qml |
308 | 52 | internal OverflowPanel OverflowPanel.qml | ||
309 | 52 | 53 | ||
310 | === modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp' | |||
311 | --- modules/Ubuntu/Components/plugin/shapeitem.cpp 2014-08-04 12:53:59 +0000 | |||
312 | +++ modules/Ubuntu/Components/plugin/shapeitem.cpp 2014-08-06 16:32:29 +0000 | |||
313 | @@ -408,9 +408,9 @@ | |||
314 | 408 | 408 | ||
315 | 409 | void ShapeItem::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) | 409 | void ShapeItem::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) |
316 | 410 | { | 410 | { |
317 | 411 | QQuickItem::geometryChanged(newGeometry, oldGeometry); | ||
318 | 412 | geometry_ = newGeometry; | 411 | geometry_ = newGeometry; |
319 | 413 | dirtyFlags_ |= ShapeItem::DirtyGeometry; | 412 | dirtyFlags_ |= ShapeItem::DirtyGeometry; |
320 | 413 | QQuickItem::geometryChanged(newGeometry, oldGeometry); | ||
321 | 414 | update(); | 414 | update(); |
322 | 415 | } | 415 | } |
323 | 416 | 416 | ||
324 | 417 | 417 | ||
325 | === modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py' | |||
326 | --- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py 2014-07-23 13:27:09 +0000 | |||
327 | +++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py 2014-08-06 16:32:29 +0000 | |||
328 | @@ -181,7 +181,7 @@ | |||
329 | 181 | 181 | ||
330 | 182 | try: | 182 | try: |
331 | 183 | tab_button = self.get_root_instance().select_single( | 183 | tab_button = self.get_root_instance().select_single( |
333 | 184 | 'Standard', objectName='tabButton' + str(index)) | 184 | objectName='tabButton' + str(index)) |
334 | 185 | except dbus.StateNotFoundError: | 185 | except dbus.StateNotFoundError: |
335 | 186 | raise _common.ToolkitException( | 186 | raise _common.ToolkitException( |
336 | 187 | "Tab button {0} not found.".format(index)) | 187 | "Tab button {0} not found.".format(index)) |
337 | @@ -229,8 +229,7 @@ | |||
338 | 229 | 229 | ||
339 | 230 | # the popover is not a child of the header, so use the root object | 230 | # the popover is not a child of the header, so use the root object |
340 | 231 | # to find the requested button | 231 | # to find the requested button |
343 | 232 | return self.get_root_instance().select_single( | 232 | return self.get_root_instance().select_single(objectName=object_name) |
342 | 233 | 'Standard', objectName=object_name) | ||
344 | 234 | 233 | ||
345 | 235 | 234 | ||
346 | 236 | class Header(AppHeader): | 235 | class Header(AppHeader): |
347 | 237 | 236 | ||
348 | === modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py' | |||
349 | --- tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py 2014-07-17 06:38:04 +0000 | |||
350 | +++ tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py 2014-08-06 16:32:29 +0000 | |||
351 | @@ -51,7 +51,6 @@ | |||
352 | 51 | 51 | ||
353 | 52 | """ | 52 | """ |
354 | 53 | overflow_popover = self.main_view.select_single( | 53 | overflow_popover = self.main_view.select_single( |
355 | 54 | 'Popover', | ||
356 | 55 | objectName='actions_overflow_popover') | 54 | objectName='actions_overflow_popover') |
357 | 56 | self.header.click_action_button('pushStackAction') | 55 | self.header.click_action_button('pushStackAction') |
358 | 57 | self.assertThat(overflow_popover.visible, Eventually(Equals(False))) | 56 | self.assertThat(overflow_popover.visible, Eventually(Equals(False))) |