Update wm_layer_control.cpp

Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>

diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp
index 1d591f0..cf3b475 100644 (file)
--- a/src/wm_layer_control.cpp
+++ b/src/wm_layer_control.cpp
@@ -23,7 +23,7 @@
 
 #define LC_AREA_PATH "/etc/areas.db"
 #define LC_LAYER_SETTING_PATH "/etc/layers_setting.json"
-#define LC_DEFAULT_AREA "normal.full"
+#define LC_DEFAULT_AREA "fullscreen"
 
 using std::string;
 using std::vector;
@@ -122,7 +122,7 @@ void LayerControl::createNewLayer(unsigned id)
     HMI_INFO("create new ID :%d", id);
     struct rect rct = this->area2size[LC_DEFAULT_AREA];
     ilm_layerCreateWithDimension(&id, rct.w, rct.h);
-    ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h);
+    //ilm_layerSetSourceRectangle(id, rct.x, rct.y, rct.w, rct.h);
     //ilm_layerSetDestinationRectangle(id, rct.x, rct.y, rct.w, rct.h);
     ilm_layerSetOpacity(id, 1.0);
     ilm_layerSetVisibility(id, ILM_FALSE);
@@ -406,7 +406,6 @@ void LayerControl::dispatchCreateEvent(ilmObjectType object, unsigned id, bool c
                 return;
             this->cb.surfaceCreated(sp.creatorPid, id);
             ilm_surfaceAddNotification(id, surfaceCallback_static);
-            ilm_surfaceSetSourceRectangle(id, 0, 0, sp.origSourceWidth, sp.origSourceHeight);
             ilm_surfaceSetVisibility(id, ILM_TRUE);
         }
         else
@@ -463,6 +462,9 @@ void LayerControl::dispatchPropertyChangeEvent(unsigned id,
     }
     if (ILM_NOTIFICATION_CONFIGURED & mask)
     {
+        HMI_DEBUG("surface %d available", id);
+        ilm_surfaceSetSourceRectangle(id, 0, 0, sprop->origSourceWidth, sprop->origSourceHeight);
+        ilm_surfaceSetDestinationRectangle(id, 0, 0, sprop->origSourceWidth, sprop->origSourceHeight);
         /* qDebug("ILM_NOTIFICATION_CONFIGURED");
         qDebug("  surfaceProperties %d", surface);
         qDebug("    surfaceProperties.origSourceWidth: %d", surfaceProperties->origSourceWidth);