modified livebox_service_touch_effect

Change-Id: I0480fbddecf1bc8b23921215cf303da0c75fbecd
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/src/FShell_AppWidgetView.cpp b/src/FShell_AppWidgetView.cpp
index 697f894..8407259 100644 (file)
--- a/src/FShell_AppWidgetView.cpp
+++ b/src/FShell_AppWidgetView.cpp
@@ -420,7 +420,8 @@ bool
 _AppWidgetView::IsTouchEffectEnabled(void) const
 {
        unique_ptr<char[]> pAppId(_StringConverter::CopyToCharArrayN(GetAppId()));
-       int ret = livebox_service_touch_effect(pAppId.get());
+       int sizeType = __pAppWidgetViewManager->GetAppWidgetSizeType(GetSizeF());
+       int ret = livebox_service_touch_effect(pAppId.get(), sizeType);
 
        return ( ret == 1 );
 }

diff --git a/src/FShell_AppWidgetViewManager.cpp b/src/FShell_AppWidgetViewManager.cpp
index ab1057f..b22b441 100644 (file)
--- a/src/FShell_AppWidgetViewManager.cpp
+++ b/src/FShell_AppWidgetViewManager.cpp
@@ -462,6 +462,26 @@ _AppWidgetViewManager::AddFrameEventListener(void)
        }
 }
 
+int
+_AppWidgetViewManager::GetAppWidgetSizeType(const Tizen::Graphics::FloatDimension& size) const
+{
+       int sizeType = LB_SIZE_TYPE_UNKNOWN;
+
+       int sizetypeCount = sizeof(LIVEBOX_SIZE_INFO) / sizeof(_AppWidgetSizeInfo);
+       for ( int i = 0; i < sizetypeCount; ++ i)
+       {
+               if (size.width <= LIVEBOX_SIZE_INFO[i].width && size.height <= LIVEBOX_SIZE_INFO[i].height)
+               {
+                       sizeType = LIVEBOX_SIZE_INFO[i].type;
+                       break;
+               }
+       }
+
+       SysLog(NID_UI_CTRL, "[%d %d] type [%d][%d]", size.width, size.height, sizeType, sizetypeCount);
+
+       return sizeType;
+}
+
 _AppWidgetViewManager::_AppWidgetViewManager(void)
        : __glMode(false)
 {
@@ -507,26 +527,6 @@ _AppWidgetViewManager::~_AppWidgetViewManager(void)
        }
 }
 
-int
-_AppWidgetViewManager::GetAppWidgetSizeType(const Tizen::Graphics::FloatDimension& size) const
-{
-       int sizeType = LB_SIZE_TYPE_UNKNOWN;
-
-       int sizetypeCount = sizeof(LIVEBOX_SIZE_INFO) / sizeof(_AppWidgetSizeInfo);
-       for ( int i = 0; i < sizetypeCount; ++ i)
-       {
-               if (size.width <= LIVEBOX_SIZE_INFO[i].width && size.height <= LIVEBOX_SIZE_INFO[i].height)
-               {
-                       sizeType = LIVEBOX_SIZE_INFO[i].type;
-                       break;
-               }
-       }
-
-       SysLog(NID_UI_CTRL, "[%d %d] type [%d][%d]", size.width, size.height, sizeType, sizetypeCount);
-
-       return sizeType;
-}
-
 MediaPixelFormat
 _AppWidgetViewManager::GetPixelFormat(BitmapPixelFormat format) const
 {

diff --git a/src/FShell_AppWidgetViewManager.h b/src/FShell_AppWidgetViewManager.h
index 2def690..a956cf1 100644 (file)
--- a/src/FShell_AppWidgetViewManager.h
+++ b/src/FShell_AppWidgetViewManager.h
@@ -66,6 +66,7 @@ public:
        Tizen::Graphics::FloatDimension GetAppWidgetPopupSize(livebox* pAppWidget) const;
        void SetAppWidgetSize(const _AppWidgetView& appwidgetView, const Tizen::Graphics::FloatDimension& size);
        void AddFrameEventListener(void);
+       int GetAppWidgetSizeType(const Tizen::Graphics::FloatDimension& size) const;
 
 private:
        _AppWidgetViewManager(void);
@@ -73,7 +74,6 @@ private:
        _AppWidgetViewManager(const _AppWidgetViewManager& rhs);
        _AppWidgetViewManager& operator =(const _AppWidgetViewManager& rhs);
 
-       int GetAppWidgetSizeType(const Tizen::Graphics::FloatDimension& size) const;
        Tizen::Media::MediaPixelFormat GetPixelFormat(Tizen::Graphics::BitmapPixelFormat format) const;
        Tizen::Graphics::Bitmap* GetBitmapN(const Tizen::Base::String& fileName) const;
        Tizen::Graphics::Bitmap* GetBitmapN(void* pBuffer, const Tizen::Graphics::FloatDimension& size) const;