X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.cpp;h=bbe7c09d154cac4010bb8bc2f93d5154bdbfb22e;hb=refs%2Ftags%2Fflounder_5.99.5;hp=6ffb4e26075d7f5c83c6c01ed7f6709755301bad;hpb=dd72b1c91895058d14bd13c3aa9a50bd75f633b6;p=apps%2Fagl-service-windowmanager-2017.git

diff --git a/src/layers.cpp b/src/layers.cpp
index 6ffb4e2..bbe7c09 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -181,22 +181,9 @@ json layer_map::to_json() const
     return j;
 }
 
-void layer_map::setupArea(int output_w, int output_h)
+void layer_map::setupArea(double scaling)
 {
     compositor::rect rct;
-    for (auto &i : this->area2size)
-    {
-        rct = i.second;
-
-        // less-than-0 values refer to MAX + 1 - $VALUE
-        // e.g. MAX is either screen width or height
-        if(rct.w < 0)
-            rct.w = output_w + 1 + rct.w;
-        if(rct.h < 0)
-            rct.h = output_h + 1 + rct.h;
-
-        i.second = rct;
-    }
 
     rct = this->area2size["normal.full"];
     this->area2size["normalfull"] = rct;
@@ -204,6 +191,11 @@ void layer_map::setupArea(int output_w, int output_h)
 
     for (auto &i : this->area2size)
     {
+        i.second.x = static_cast<int>(scaling * i.second.x + 0.5);
+        i.second.y = static_cast<int>(scaling * i.second.y + 0.5);
+        i.second.w = static_cast<int>(scaling * i.second.w + 0.5);
+        i.second.h = static_cast<int>(scaling * i.second.h + 0.5);
+
         HMI_DEBUG("wm:lm", "area:%s size(after) : x:%d y:%d w:%d h:%d",
             i.first.c_str(), i.second.x, i.second.y, i.second.w, i.second.h);
     }
@@ -308,8 +300,8 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 0, \
-                \"w\": -1, \
-                \"h\": -1 \
+                \"w\": 1080, \
+                \"h\": 1920 \
             } \
         }, \
         { \
@@ -317,8 +309,8 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 218, \
-                \"w\": -1, \
-                \"h\": -433 \
+                \"w\": 1080, \
+                \"h\": 1488 \
             } \
         }, \
         { \
@@ -326,7 +318,7 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 218, \
-                \"w\": -1, \
+                \"w\": 1080, \
                 \"h\": 744 \
             } \
         }, \
@@ -335,7 +327,7 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 962, \
-                \"w\": -1, \
+                \"w\": 1080, \
                 \"h\": 744 \
             } \
         }, \
@@ -344,7 +336,7 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 962, \
-                \"w\": -1, \
+                \"w\": 1080, \
                 \"h\": 744 \
             } \
         }, \
@@ -353,8 +345,8 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 218, \
-                \"w\": -1, \
-                \"h\": -433 \
+                \"w\": 1080, \
+                \"h\": 1488 \
             } \
         }, \
         { \
@@ -362,7 +354,7 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 218, \
-                \"w\": -1, \
+                \"w\": 1080, \
                 \"h\": 744 \
             } \
         }, \
@@ -371,7 +363,7 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 962, \
-                \"w\": -1, \
+                \"w\": 1080, \
                 \"h\": 744 \
             } \
         }, \
@@ -380,8 +372,8 @@ const char* layer_map::kDefaultAreaDb = "{ \
             \"rect\": { \
                 \"x\": 0, \
                 \"y\": 218, \
-                \"w\": -1, \
-                \"h\": -433 \
+                \"w\": 1080, \
+                \"h\": 1488 \
             } \
         } \
     ] \