Merge lp:~boiko/dialer-app/rtm-qsg_optimizations into lp:dialer-app/rtm-14.09

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Bill Filler
Approved revision: 252
Merged at revision: 262
Proposed branch: lp:~boiko/dialer-app/rtm-qsg_optimizations
Merge into: lp:dialer-app/rtm-14.09
Diff against target: 96 lines (+24/-18)
5 files modified
src/qml/DialerPage/DialerPage.qml (+12/-0)
src/qml/DialerPage/KeypadButton.qml (+0/-1)
src/qml/HistoryPage/HistoryDetailsPage.qml (+0/-5)
src/qml/LiveCallPage/LiveCall.qml (+12/-0)
src/qml/dialer-app.qml (+0/-12)
To merge this branch: bzr merge lp:~boiko/dialer-app/rtm-qsg_optimizations
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+247166@code.launchpad.net

Commit message

Do some basic QSceneGraph rendering optimizations.

Description of the change

Do some basic QSceneGraph rendering optimizations.

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
=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml 2014-12-04 12:52:57 +0000
+++ src/qml/DialerPage/DialerPage.qml 2015-01-21 16:24:27 +0000
@@ -199,6 +199,18 @@
199 }199 }
200 }200 }
201201
202 Image {
203 id: background
204 anchors {
205 left: parent.left
206 right: parent.right
207 bottom: parent.bottom
208 }
209
210 source: Qt.resolvedUrl("../assets/dialer_background_full.png")
211 asynchronous: true
212 }
213
202 FocusScope {214 FocusScope {
203 id: keypadContainer215 id: keypadContainer
204216
205217
=== modified file 'src/qml/DialerPage/KeypadButton.qml'
--- src/qml/DialerPage/KeypadButton.qml 2014-09-08 17:18:12 +0000
+++ src/qml/DialerPage/KeypadButton.qml 2015-01-21 16:24:27 +0000
@@ -52,7 +52,6 @@
52 objectName: "keypadButtonLabelsContainer"52 objectName: "keypadButtonLabelsContainer"
53 height: childrenRect.height53 height: childrenRect.height
54 width: parent.width54 width: parent.width
55 clip: true
56 anchors.centerIn: parent55 anchors.centerIn: parent
57 scale: button.pressed ? 0.9 : 156 scale: button.pressed ? 0.9 : 1
5857
5958
=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml 2015-01-09 11:54:33 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml 2015-01-21 16:24:27 +0000
@@ -116,11 +116,6 @@
116 }116 }
117 }117 }
118118
119 Rectangle {
120 anchors.fill: parent
121 color: Theme.palette.normal.background
122 }
123
124 ListView {119 ListView {
125 id: eventsView120 id: eventsView
126 anchors.fill: parent121 anchors.fill: parent
127122
=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml 2014-12-16 01:11:54 +0000
+++ src/qml/LiveCallPage/LiveCall.qml 2015-01-21 16:24:27 +0000
@@ -287,6 +287,18 @@
287 return i18n.tr("Unknown device")287 return i18n.tr("Unknown device")
288 }288 }
289289
290 Image {
291 id: background
292 anchors {
293 left: parent.left
294 right: parent.right
295 bottom: parent.bottom
296 }
297
298 source: Qt.resolvedUrl("../assets/dialer_background_full.png")
299 asynchronous: true
300 }
301
290 // FIXME: this invisible label is only used for302 // FIXME: this invisible label is only used for
291 // calculating the size of the screen and resizing303 // calculating the size of the screen and resizing
292 // the dtmf string accordingly so it can fit the page header304 // the dtmf string accordingly so it can fit the page header
293305
=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml 2014-12-04 13:24:23 +0000
+++ src/qml/dialer-app.qml 2015-01-21 16:24:27 +0000
@@ -351,18 +351,6 @@
351 }351 }
352 }352 }
353353
354 Image {
355 id: background
356 anchors {
357 left: parent.left
358 right: parent.right
359 bottom: parent.bottom
360 }
361
362 source: Qt.resolvedUrl("assets/dialer_background_full.png")
363 asynchronous: true
364 }
365
366 Component {354 Component {
367 id: noNetworkDialog355 id: noNetworkDialog
368 Dialog {356 Dialog {

Subscribers

People subscribed via source and target branches