change type of x, y position of LiveboxPopup to float

Change-Id: I81756e941a2c942cc8ef3cf930737b1fc71ebbc4
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

diff --git a/inc/FShell_LiveboxContext.h b/inc/FShell_LiveboxContext.h
index 6437848..733c87c 100644 (file)
--- a/inc/FShell_LiveboxContext.h
+++ b/inc/FShell_LiveboxContext.h
@@ -57,7 +57,7 @@ public:
        void OnRemoved();
        void OnForeground();
        void OnBackground();
-       virtual void OnPopupCreated(int x, int y, int width, int height);
+       virtual void OnPopupCreated(double x, double y, int width, int height);
        virtual void OnPopupDestoyed(void);
 
        result RequestUpdateRemote(int width, int height);

diff --git a/inc/FShell_LiveboxContextBase.h b/inc/FShell_LiveboxContextBase.h
index 5265b77..4f124c4 100644 (file)
--- a/inc/FShell_LiveboxContextBase.h
+++ b/inc/FShell_LiveboxContextBase.h
@@ -45,7 +45,7 @@ public:
        _LiveboxContextBase(target_type type, const Tizen::Base::String& userInfo, const Tizen::Base::String& providerId, const Tizen::Base::String& instanceId, int width, int height, int priority);
        virtual ~_LiveboxContextBase();
 
-       virtual void OnPopupCreated(int x, int y, int width, int height) = 0;
+       virtual void OnPopupCreated(double x, double y, int width, int height) = 0;
        virtual void OnPopupDestoyed(void) = 0;
 
        virtual result SendTouchEvent(buffer_event event, double timestamp, double x, double y) = 0;

diff --git a/inc/FShell_LiveboxPopupContext.h b/inc/FShell_LiveboxPopupContext.h
index 24efaf4..d634977 100644 (file)
--- a/inc/FShell_LiveboxPopupContext.h
+++ b/inc/FShell_LiveboxPopupContext.h
@@ -38,11 +38,11 @@ public:
        virtual ~_LiveboxPopupContext();
 
        // event handler
-       void OnPopupCreated(int x, int y, int width, int height);
+       void OnPopupCreated(double x, double y, int width, int height);
        void OnPopupDestoyed(void);
 
        // request to app
-       result SendPopupCreateRequest(int x, int y, int width, int height);
+       result SendPopupCreateRequest(double x, double y, int width, int height);
        result SendPopupDestroyRequest();
        virtual result SendTouchEvent(buffer_event event, double timestamp, double x, double y);
 

diff --git a/src/FShell_LiveboxContext.cpp b/src/FShell_LiveboxContext.cpp
index f6fc332..84bfb0a 100644 (file)
--- a/src/FShell_LiveboxContext.cpp
+++ b/src/FShell_LiveboxContext.cpp
@@ -141,7 +141,7 @@ _LiveboxContext::OnBackground()
 }
 
 void
-_LiveboxContext::OnPopupCreated(int x, int y, int width, int height)
+_LiveboxContext::OnPopupCreated(double x, double y, int width, int height)
 {
        __pLiveboxPopup = new (std::nothrow) _LiveboxPopupContext(__userInfo, __providerId, __instanceId, width, height, __priority);
        __pLiveboxPopup->SetClientId(__ipcClientId);

diff --git a/src/FShell_LiveboxPopupContext.cpp b/src/FShell_LiveboxPopupContext.cpp
index a0dd789..c96acab 100644 (file)
--- a/src/FShell_LiveboxPopupContext.cpp
+++ b/src/FShell_LiveboxPopupContext.cpp
@@ -65,7 +65,7 @@ _LiveboxPopupContext::~_LiveboxPopupContext()
 
 
 void
-_LiveboxPopupContext::OnPopupCreated(int x, int y, int width, int height)
+_LiveboxPopupContext::OnPopupCreated(double x, double y, int width, int height)
 {
        SysLog(NID_APP, "width(%d), height(%d)", width, height);
        SendPopupCreateRequest(x, y, width, height);
@@ -79,12 +79,12 @@ _LiveboxPopupContext::OnPopupDestoyed()
 }
 
 result
-_LiveboxPopupContext::SendPopupCreateRequest(int x, int y, int width, int height)
+_LiveboxPopupContext::SendPopupCreateRequest(double x, double y, int width, int height)
 {
        std::unique_ptr<HashMap, AllElementsDeleter> pArgs (CreateRequestArgs() );
 
-       pArgs->Add(new String(ARG_KEY_X), new String(Integer::ToString(x)));
-       pArgs->Add(new String(ARG_KEY_Y), new String(Integer::ToString(y)));
+       pArgs->Add(new String(ARG_KEY_X), new String(Double::ToString(x)));
+       pArgs->Add(new String(ARG_KEY_Y), new String(Double::ToString(y)));
        pArgs->Add(new String(ARG_KEY_WIDTH), new String(Integer::ToString(width)));
        pArgs->Add(new String(ARG_KEY_HEIGHT), new String(Integer::ToString(height)));