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

Proposed by Gustavo Pichorim Boiko on 2015-01-21
Status: Merged
Approved by: Bill Filler on 2015-02-11
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 2015-01-21 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
1=== modified file 'src/qml/DialerPage/DialerPage.qml'
2--- src/qml/DialerPage/DialerPage.qml 2014-12-04 12:52:57 +0000
3+++ src/qml/DialerPage/DialerPage.qml 2015-01-21 16:24:27 +0000
4@@ -199,6 +199,18 @@
5 }
6 }
7
8+ Image {
9+ id: background
10+ anchors {
11+ left: parent.left
12+ right: parent.right
13+ bottom: parent.bottom
14+ }
15+
16+ source: Qt.resolvedUrl("../assets/dialer_background_full.png")
17+ asynchronous: true
18+ }
19+
20 FocusScope {
21 id: keypadContainer
22
23
24=== modified file 'src/qml/DialerPage/KeypadButton.qml'
25--- src/qml/DialerPage/KeypadButton.qml 2014-09-08 17:18:12 +0000
26+++ src/qml/DialerPage/KeypadButton.qml 2015-01-21 16:24:27 +0000
27@@ -52,7 +52,6 @@
28 objectName: "keypadButtonLabelsContainer"
29 height: childrenRect.height
30 width: parent.width
31- clip: true
32 anchors.centerIn: parent
33 scale: button.pressed ? 0.9 : 1
34
35
36=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
37--- src/qml/HistoryPage/HistoryDetailsPage.qml 2015-01-09 11:54:33 +0000
38+++ src/qml/HistoryPage/HistoryDetailsPage.qml 2015-01-21 16:24:27 +0000
39@@ -116,11 +116,6 @@
40 }
41 }
42
43- Rectangle {
44- anchors.fill: parent
45- color: Theme.palette.normal.background
46- }
47-
48 ListView {
49 id: eventsView
50 anchors.fill: parent
51
52=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
53--- src/qml/LiveCallPage/LiveCall.qml 2014-12-16 01:11:54 +0000
54+++ src/qml/LiveCallPage/LiveCall.qml 2015-01-21 16:24:27 +0000
55@@ -287,6 +287,18 @@
56 return i18n.tr("Unknown device")
57 }
58
59+ Image {
60+ id: background
61+ anchors {
62+ left: parent.left
63+ right: parent.right
64+ bottom: parent.bottom
65+ }
66+
67+ source: Qt.resolvedUrl("../assets/dialer_background_full.png")
68+ asynchronous: true
69+ }
70+
71 // FIXME: this invisible label is only used for
72 // calculating the size of the screen and resizing
73 // the dtmf string accordingly so it can fit the page header
74
75=== modified file 'src/qml/dialer-app.qml'
76--- src/qml/dialer-app.qml 2014-12-04 13:24:23 +0000
77+++ src/qml/dialer-app.qml 2015-01-21 16:24:27 +0000
78@@ -351,18 +351,6 @@
79 }
80 }
81
82- Image {
83- id: background
84- anchors {
85- left: parent.left
86- right: parent.right
87- bottom: parent.bottom
88- }
89-
90- source: Qt.resolvedUrl("assets/dialer_background_full.png")
91- asynchronous: true
92- }
93-
94 Component {
95 id: noNetworkDialog
96 Dialog {

Subscribers

People subscribed via source and target branches