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

[Bartosz Kosiorek]

Do not allow flicking above edge of keypad

Do not allow flicking above edge of keypad

[Giulio Collura (gcollura)]

It indeed fixes the related bug. Thanks!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== 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 @@
                 index = Math.max(0, currentIndex - 1)
             } else {
                 index = Math.round(contentX / (width + keyboardsRow.spacing))
+                index = Math.max(0, index)
+                index = Math.min(keyboardsRow.children.length - 1, index)
             }
 
             currentIndex = index;