WindowManager now handles application surfaces by its pids.

Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>

3 files changed, 7 insertions, 6 deletions

diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp
index 647bc79..65e0194 100644
--- a/HomeScreen/src/layouthandler.cpp
+++ b/HomeScreen/src/layouthandler.cpp
@@ -38,7 +38,7 @@ void LayoutHandler::setUpLayouts()
     SimpleRect surfaceArea;
 
     const int SCREEN_WIDTH = 1080;
-    const int SCREEN_HEIGHT = 1080;
+    const int SCREEN_HEIGHT = 1920;
 
     const int STATUSBAR_HEIGHT = 60;
     const int STATUSBAR_WIDTH = SCREEN_WIDTH;
@@ -77,7 +77,7 @@ void LayoutHandler::setUpLayouts()
 
     // bottom surface
     surfaceArea.x = 0;
-    surfaceArea.y = STATUSBAR_HEIGHT / 2;
+    surfaceArea.y = SCREEN_HEIGHT / 2;
     surfaceArea.width = SCREEN_WIDTH;
     surfaceArea.height = (SCREEN_HEIGHT - STATUSBAR_HEIGHT - CONTROLBAR_HEIGHT) / 2;
 
@@ -133,7 +133,7 @@ void LayoutHandler::makeMeVisible(int pid)
 
         for (int i = 0; i < m_visibleApps.size(); ++i)
         {
-            mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(i, i);
+            mp_dBusWindowManagerProxy->setPidToLayoutArea(i, i);
         }
     }
     if (1 == availableLayouts.size())
@@ -146,7 +146,7 @@ void LayoutHandler::makeMeVisible(int pid)
         mp_dBusWindowManagerProxy->setLayoutById(availableLayouts.at(0));
         for (int i = 0; i < m_visibleApps.size(); ++i)
         {
-            mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(i, i);
+            mp_dBusWindowManagerProxy->setPidToLayoutArea(i, i);
         }
     }
     if (1 < availableLayouts.size())
@@ -175,6 +175,6 @@ void LayoutHandler::setLayoutByName(QString layoutName)
     mp_dBusWindowManagerProxy->setLayoutByName(layoutName);
     for (int i = 0; i < m_visibleApps.size(); ++i)
     {
-        mp_dBusWindowManagerProxy->setSurfaceToLayoutArea(i, i);
+        mp_dBusWindowManagerProxy->setPidToLayoutArea(i, i);
     }
 }
diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp
index 264468b..2701d34 100644
--- a/HomeScreen/src/main.cpp
+++ b/HomeScreen/src/main.cpp
@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain("LinuxFoundation");
     QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
     QCoreApplication::setApplicationName("HomeScreen");
-    QCoreApplication::setApplicationVersion("0.3.0");
+    QCoreApplication::setApplicationVersion("0.3.3");
 
     QSurfaceFormat format;
     format.setDepthBufferSize(16);
diff --git a/HomeScreen/src/popupwidget.cpp b/HomeScreen/src/popupwidget.cpp
index e7226dd..6f7d9cb 100644
--- a/HomeScreen/src/popupwidget.cpp
+++ b/HomeScreen/src/popupwidget.cpp
@@ -72,6 +72,7 @@ void PopupWidget::showPopup(int /*type*/, const QString &text)
 
 void PopupWidget::showPopupComboBox(const QString &text, const QStringList &choices)
 {
+    mp_ui->comboBox_choice->clear();
     m_sendComboBoxChoice = true;
     mp_ui->comboBox_choice->addItems(choices);
     mp_ui->comboBox_choice->show();