diff options
author | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-12-09 12:14:02 +0100 |
---|---|---|
committer | Bocklage, Jens <Jens_Bocklage@mentor.com> | 2016-12-09 12:14:02 +0100 |
commit | f2b8bddb94a451c4bd822ef723a8b739236f4b4f (patch) | |
tree | ed256a1c68b063b999b62cd0664c3dbdcb0fbc85 /HomeScreen/qml/main.qml | |
parent | b6d6fdc6384e686c8d866212b2f5d63ca884b3c5 (diff) |
Integrate Home app into HomeScreen
Home is located in ces2017 repo. But since it has to use
HomeScreen internal components (layermanager and applauncher),
I had to move it to main HomeScreen app.
Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
Diffstat (limited to 'HomeScreen/qml/main.qml')
-rw-r--r-- | HomeScreen/qml/main.qml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/HomeScreen/qml/main.qml b/HomeScreen/qml/main.qml index 542f395..143d649 100644 --- a/HomeScreen/qml/main.qml +++ b/HomeScreen/qml/main.qml @@ -18,6 +18,7 @@ import QtQuick 2.2 import QtQuick.Window 2.1 import QtQuick.Layouts 1.1 +import HomeScreen 1.0 Window { visible: true @@ -26,6 +27,14 @@ Window { height: container.height * container.scale title: 'HomeScreen' + ApplicationLauncher { + id: launcher + } + + LayoutHandler { + id: layoutHandler + } + Image { id: container anchors.centerIn: parent @@ -48,6 +57,16 @@ Window { Layout.fillWidth: true Layout.fillHeight: true Layout.preferredHeight: 1920 - 218 - 215 + + visible: true + } + + Home { + id: appLauncherAreaLauncher + Layout.fillWidth: true + Layout.fillHeight: true + Layout.preferredHeight: 1920 - 218 - 215 + visible: false } MediaArea { |