Merge lp:~renatofilho/address-book-app/fix-1426359 into lp:address-book-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 396
Merged at revision: 416
Proposed branch: lp:~renatofilho/address-book-app/fix-1426359
Merge into: lp:address-book-app
Diff against target: 41 lines (+6/-2)
3 files modified
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+4/-1)
src/imports/Ubuntu/Contacts/MostCalledModel.qml (+1/-0)
src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp (+1/-1)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/fix-1426359
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+251310@code.launchpad.net

Commit message

Fixed favorite list scroll to the first item.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
393. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
394. By Renato Araujo Oliveira Filho

Reduce the most called list size to 5 entries.

395. By Renato Araujo Oliveira Filho

Fixed most called model to show the correct number of contacts based on maxCount property.

396. By Renato Araujo Oliveira Filho

Use contactListView.positionViewAtIndex to fix first favorite item visiblity.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
2--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2015-03-17 17:14:09 +0000
3+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2015-04-02 17:17:18 +0000
4@@ -337,8 +337,11 @@
5 return
6 // check if we should expand and display the details picker
7 } else if (detailToPick !== -1) {
8- //view.highlightFollowsCurrentItem = true
9 contactListView.currentIndex = index
10+ if (index == 0) {
11+ // WORKAROUND: Due the header the ListView does the wrong scolling for the first item
12+ contactListView.positionViewAtIndex(0, ListView.Beginning)
13+ }
14 return
15 } else if (detailToPick == -1) {
16 contactListView.detailClicked(contact, null, "")
17
18=== modified file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
19--- src/imports/Ubuntu/Contacts/MostCalledModel.qml 2014-10-14 15:57:09 +0000
20+++ src/imports/Ubuntu/Contacts/MostCalledModel.qml 2015-04-02 17:17:18 +0000
21@@ -58,6 +58,7 @@
22 id: mostCalledModel
23
24 startInterval: new Date((new Date().getTime() - 2592000000)) // one month ago
25+ maxCount: 5
26 onLoaded: root.loaded()
27 sourceModel: historyEventModel
28 }
29
30=== modified file 'src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp'
31--- src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp 2014-09-05 02:22:31 +0000
32+++ src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp 2015-04-02 17:17:18 +0000
33@@ -337,7 +337,7 @@
34 if (d.callCount >= m_average) {
35 m_data << d;
36 }
37- if ((uint) m_data.size() > m_maxCount) {
38+ if ((uint) m_data.size() >= m_maxCount) {
39 break;
40 }
41 }

Subscribers

People subscribed via source and target branches