1
=== modified file 'app/ubuntu-calculator-app.qml'
2
--- app/ubuntu-calculator-app.qml	2015-03-30 08:33:45 +0000
3
+++ app/ubuntu-calculator-app.qml	2015-04-06 12:49:50 +0000
4
@@ -34,7 +34,7 @@
5
34
    // Removes the old toolbar and enables new features of the new header.
34
    // Removes the old toolbar and enables new features of the new header.
6
35
    useDeprecatedToolbar: false;
35
    useDeprecatedToolbar: false;
7
36
    automaticOrientation: true
36
    automaticOrientation: true
9
37
    anchorToKeyboard: true
37
    anchorToKeyboard: textInputField.visible ? false : true
10
38
38
11
39
    width: units.gu(40);
39
    width: units.gu(40);
12
40
    height: units.gu(70);
40
    height: units.gu(70);
13
@@ -73,11 +73,6 @@
14
73
    // If it is set to false, then editing will be invoked
73
    // If it is set to false, then editing will be invoked
15
74
    property bool deleteSelectedCalculation: true;
74
    property bool deleteSelectedCalculation: true;
16
75
75
17
76
    Connections {
18
77
        id: oskKeyboard
19
78
        target: Qt.inputMethod
20
79
    }
21
80
22
81
    /**
76
    /**
23
82
     * The function calls the Formula.deleteLastFormulaElement function and
77
     * The function calls the Formula.deleteLastFormulaElement function and
24
83
     * place the result in right vars
78
     * place the result in right vars
25
@@ -508,6 +503,7 @@
26
508
                anchors {
503
                anchors {
27
509
                    top: header.bottom
504
                    top: header.bottom
28
510
                    bottom: parent.bottom
505
                    bottom: parent.bottom
29
506
                    bottomMargin: textInputField.visible ? 0 : -keyboardLoader.height
30
511
                    left: parent.left
507
                    left: parent.left
31
512
                    right: parent.right
508
                    right: parent.right
32
513
                }
509
                }
33
@@ -635,9 +631,9 @@
34
635
                Loader {
631
                Loader {
35
636
                    id: keyboardLoader
632
                    id: keyboardLoader
36
637
                    width: parent.width
633
                    width: parent.width
37
638
                    visible: textInputField.visible && !oskKeyboard.visible
38
639
                    source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraitKeyboard.qml"
634
                    source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraitKeyboard.qml"
40
640
                    opacity: ((y + height) >= scrollableView.contentY) && (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
635
                    opacity: ((y + height) >= scrollableView.contentY) &&
41
636
                            (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
42
641
                }
637
                }
43
642
            }
638
            }
44
643
        }
639
        }
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-04-07
Alan Pope 🍺🐧🐱 🦄 (community)		2015-04-01	Approve on 2015-04-07
Review via email: mp+254875@code.launchpad.net