From bdcd052f995d46abeeeda3171759aabad7dd8a75 Mon Sep 17 00:00:00 2001
From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 22 Jul 2020 22:13:29 -0400
Subject: Fix panel backgrounds and sizes

The split into 3 windows done for the switch to the new compositor
dropped the full screen image background that had previously been
used, but did not set any replacement for the new top and bottom panel
windows.  This, combined with some rows of transparent pixels at the
bottom and top of the respective panel background images, resulted in
the default white background being visible in those areas.

To fix this, the background of the panel windows has been set to the
color used in the previous background image for those areas (#33363a).
Additionally:
- the top and bottom panel sizes have been rationalized to 216 pixels
  high each, since there is no longer any reason to have them be
  different sizes.
- the now unused main.qml has been removed to avoid confusion.

Bug-AGL: SPEC-3420

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ib656ff256f05362def378047171d1fe940355790
---
 homescreen/qml/main.qml | 156 ------------------------------------------------
 1 file changed, 156 deletions(-)
 delete mode 100644 homescreen/qml/main.qml

(limited to 'homescreen/qml/main.qml')

diff --git a/homescreen/qml/main.qml b/homescreen/qml/main.qml
deleted file mode 100644
index 233ee4f..0000000
--- a/homescreen/qml/main.qml
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2016 The Qt Company Ltd.
- * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import QtQuick 2.2
-import QtQuick.Window 2.1
-import QtQuick.Layouts 1.1
-import HomeScreen 1.0
-
-Window {
-    visible: true
-    flags: Qt.FramelessWindowHint
-    width: container.width * container.scale
-    height: container.height * container.scale
-    title: 'HomeScreen'
-
-    Image {
-        id: container
-        anchors.centerIn: parent
-        width: 1080
-        height: 1920
-        scale: screenInfo.scale_factor()
-        source: './images/AGL_HMI_Blue_Background_NoCar-01.png'
-
-        ColumnLayout {
-            anchors.fill: parent
-            spacing: 0
-            TopArea {
-                id: topArea
-                Layout.fillWidth: true
-                Layout.preferredHeight: 218
-            }
-
-            Item {
-                id: applicationArea
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                Layout.preferredHeight: 1920 - 218 - 215
-
-                visible: true
-            }
-
-            MediaArea {
-                id: mediaArea
-                Layout.fillWidth: true
-                Layout.fillHeight: true
-                Layout.preferredHeight: 215
-            }
-        }
-    }
-
-    Timer {
-        id:informationTimer
-        interval: 3000
-        running: false
-        repeat: true
-        onTriggered: {
-            bottomInformation.visible = false
-        }
-    }
-
-    Item {
-        id: bottomInformation
-        width: parent.width
-        height: 215
-        anchors.bottom: parent.bottom
-        visible: false
-        Text {
-            id: bottomText
-            anchors.centerIn: parent
-            font.pixelSize: 25
-            font.letterSpacing: 5
-            horizontalAlignment: Text.AlignHCenter
-            color: "white"
-            text: ""
-            z:1
-        }
-    }
-
-    Connections {
-        target: homescreenHandler
-        onShowInformation: {
-            bottomText.text = info
-            bottomInformation.visible = true
-            informationTimer.restart()
-        }
-    }
-
-    Timer {
-        id:notificationTimer
-        interval: 3000
-        running: false
-        repeat: true
-        onTriggered: notificationItem.visible = false
-    }
-
-    Item {
-        id: notificationItem
-        x: 0
-        y: 0
-        z: 1
-        width: 1280
-        height: 100
-        opacity: 0.8
-        visible: false
-
-        Rectangle {
-            width: parent.width
-            height: parent.height
-            anchors.fill: parent
-            color: "gray"
-            Image {
-                id: notificationIcon
-                width: 70
-                height: 70
-                anchors.left: parent.left
-                anchors.leftMargin: 20
-                anchors.verticalCenter: parent.verticalCenter
-                source: ""
-            }
-
-            Text {
-                id: notificationtext
-                font.pixelSize: 25
-                anchors.left: notificationIcon.right
-                anchors.leftMargin: 5
-                anchors.verticalCenter: parent.verticalCenter
-                color: "white"
-                text: qsTr("")
-            }
-        }
-    }
-
-    Connections {
-        target: homescreenHandler
-        onShowNotification: {
-            notificationIcon.source = icon_path
-            notificationtext.text = text
-            notificationItem.visible = true
-            notificationTimer.restart()
-        }
-    }
-}
-- 
cgit 1.2.3-korg