1 files changed, 72 insertions, 70 deletions
diff --git a/app/Controls.qml b/app/Controls.qml
index 211c86f..08e6c5d 100644
--- a/app/Controls.qml
+++ b/app/Controls.qml
@@ -17,94 +17,96 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
-import QtQuick.Window 2.0
-import QtQuick.VirtualKeyboard 2.1
 import AGL.Demo.Controls 1.0
 
 ApplicationWindow {
     id: root
-    Item {
-        anchors.fill: parent
-        anchors.bottom: inputPanel.top
-        GridLayout {
-            anchors.fill: parent
-            anchors.margins: root.width / 20
-            columns: 2
-            rowSpacing: 20
 
-            Label { text: 'Label:' }
-            Label {
-                text: 'This is a label'
-            }
+    ColumnLayout {
+        anchors.fill: parent
+        Item {
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            GridLayout {
+                anchors.fill: parent
+                anchors.margins: root.width / 20
+                columns: 2
+                rowSpacing: 20
 
-            Label { text: 'Button:' }
-            Row {
-                spacing: 20
-                Button {
-                    text: 'Normal'
-                }
-                Button {
-                    text: 'Highlighted'
-                    highlighted: true
+                Label { text: 'Label:' }
+                Label {
+                    text: 'This is a label'
                 }
-            }
-
-            Label { text: 'Switch:' }
-            Switch {}
 
-            Label { text: 'ProgressBar:' }
-            ProgressBar {
-                Layout.fillWidth: true
-                NumberAnimation on value {
-                    from: 0
-                    to: 1
-                    duration: 5000
-                    loops: Animation.Infinite
-                    easing.type: Easing.SineCurve
+                Label { text: 'Button:' }
+                Row {
+                    spacing: 20
+                    Button {
+                        text: 'Normal'
+                    }
+                    Button {
+                        text: 'Highlighted'
+                        highlighted: true
+                    }
                 }
-            }
 
-            Label { text: 'Slider:' }
-            Slider {
-                Layout.fillWidth: true
-            }
+                Label { text: 'Switch:' }
+                Switch {}
 
-            Label { text: 'TextField:' }
-            TextField {}
+                Label { text: 'ProgressBar:' }
+                ProgressBar {
+                    Layout.fillWidth: true
+                    NumberAnimation on value {
+                        from: 0
+                        to: 1
+                        duration: 5000
+                        loops: Animation.Infinite
+                        easing.type: Easing.SineCurve
+                    }
+                }
 
-            Label { text: 'Password:' }
-            TextField {
-                echoMode: TextInput.Password
-                inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText
-            }
+                Label { text: 'Slider:' }
+                Slider {
+                    Layout.fillWidth: true
+                }
 
-            Label { text: 'ToggleButton:' }
-            ToggleButton {
-                onImage: './images/HMI_HVAC_AC_Active.svg'
-                offImage: './images/HMI_HVAC_AC_Inactive.svg'
-            }
+                Label { text: 'TextField:' }
+                TextField {}
 
-            Label { text: 'Tumbler:' }
-            RowLayout {
-                Tumbler {
-                    model: 12
+                Label { text: 'Password:' }
+                TextField {
+                    echoMode: TextInput.Password
+                    inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhSensitiveData | Qt.ImhNoPredictiveText
                 }
-                Label { text: ':' }
-                Tumbler {
-                    model: 60
+
+                Label { text: 'ToggleButton:' }
+                ToggleButton {
+                    onImage: './images/HMI_HVAC_AC_Active.svg'
+                    offImage: './images/HMI_HVAC_AC_Inactive.svg'
                 }
-                Tumbler {
-                    model: ['AM', 'PM']
+
+                Label { text: 'Tumbler:' }
+                RowLayout {
+                    Tumbler {
+                        model: 12
+                    }
+                    Label { text: ':' }
+                    Tumbler {
+                        model: 60
+                    }
+                    Tumbler {
+                        model: ['AM', 'PM']
+                    }
                 }
+                Item { Layout.fillHeight: true }
             }
-            Item { Layout.fillHeight: true }
         }
-    }
-    InputPanel {
-        id: inputPanel
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        visible: active
+        Keyboard {
+            id: keyboard
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            z: 99
+            target: root.activeFocusControl
+        }
     }
 }