Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-flick-fix2 into lp:ubuntu-calculator-app

Proposed by Bartosz Kosiorek
Status: Merged
Approved by: Giulio Collura
Approved revision: 74
Merged at revision: 76
Proposed branch: lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-flick-fix2
Merge into: lp:ubuntu-calculator-app
Diff against target: 12 lines (+2/-0)
1 file modified
app/ui/CalcKeyboard.qml (+2/-0)
To merge this branch: bzr merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-flick-fix2
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Giulio Collura Approve
Review via email: mp+247480@code.launchpad.net

Commit message

Do not allow flicking above edge of keypad

Description of the change

Do not allow flicking above edge of keypad

To post a comment you must log in.
Revision history for this message
Giulio Collura (gcollura) wrote :

It indeed fixes the related bug. Thanks!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'app/ui/CalcKeyboard.qml'
--- app/ui/CalcKeyboard.qml 2014-12-11 09:59:23 +0000
+++ app/ui/CalcKeyboard.qml 2015-01-23 21:02:17 +0000
@@ -46,6 +46,8 @@
46 index = Math.max(0, currentIndex - 1)46 index = Math.max(0, currentIndex - 1)
47 } else {47 } else {
48 index = Math.round(contentX / (width + keyboardsRow.spacing))48 index = Math.round(contentX / (width + keyboardsRow.spacing))
49 index = Math.max(0, index)
50 index = Math.min(keyboardsRow.children.length - 1, index)
49 }51 }
5052
51 currentIndex = index;53 currentIndex = index;

Subscribers

People subscribed via source and target branches