ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-swipe-lock into lp:ubuntu-calculator-app.

Commit message:
Do not allow swiping in Landscape mode

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)
Related bugs:
  Bug #1466635 in Ubuntu Calculator App: "Lock swiping in extended mode"
  https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1466635

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-swipe-lock/+merge/262551

Do not allow swiping in Landscape mode
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-swipe-lock into lp:ubuntu-calculator-app.

=== modified file 'app/ui/CalcKeyboard.qml'
--- app/ui/CalcKeyboard.qml	2015-03-05 22:57:16 +0000
+++ app/ui/CalcKeyboard.qml	2015-06-21 23:02:00 +0000
@@ -30,11 +30,12 @@
     Flickable {
         id: flickableKeyboard
         anchors { left: parent.left; bottom: parent.bottom; right: parent.right }
+        boundsBehavior: Flickable.DragOverBounds
         flickableDirection: Flickable.HorizontalFlick
         contentWidth: virtualKeyboard.width * keyboardsRow.children.length
         contentHeight: keyboardsRow.height + units.gu(1)
         height: contentHeight
-        boundsBehavior: Flickable.DragOverBounds
+        interactive: keyboardsRow.children.length === 1 ? false : true
 
         property int currentIndex: 0