Adjusted a gesture operation domain.

Change-Id: I718712f6bca0727da28b88c50ac0ec9798c77cc2
Signed-off-by: Masayuki Sasaki <masayuki.sasaki@mail.toyota-td.jp>

diff --git a/src/homescreen/CicoHSSwipeTouch.h b/src/homescreen/CicoHSSwipeTouch.h
index 553c757..b484fc1 100644 (file)
--- a/src/homescreen/CicoHSSwipeTouch.h
+++ b/src/homescreen/CicoHSSwipeTouch.h
@@ -23,10 +23,10 @@
 #include "CicoHSControlBarWindow.h"
 #include "CicoHSAppHistoryExt.h"
 
-#define ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH 80
+#define ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH  80
 #define ICO_HS_SWIPE_TOUCH_SWIPE_HEIGHT 80
-#define ICO_HS_SWIPE_TOUCH_DISTANCE_XY1 (-40)
-#define ICO_HS_SWIPE_TOUCH_DISTANCE_XY2 100
+#define ICO_HS_SWIPE_TOUCH_DISTANCE_TOP     200
+#define ICO_HS_SWIPE_TOUCH_DISTANCE_BOTTOM  128
 #define ICO_HS_SWIPE_TOUCH_SWIPE_THREASHOLD_DISTANCE 60
 #define ICO_HS_SWIPE_TOUCH_SWIPE_ANIMA_TIME 300
 

diff --git a/src/homescreen/CicoHomeScreen.cpp b/src/homescreen/CicoHomeScreen.cpp
index 5121767..9b64cfb 100644 (file)
--- a/src/homescreen/CicoHomeScreen.cpp
+++ b/src/homescreen/CicoHomeScreen.cpp
@@ -1536,27 +1536,26 @@ CicoHomeScreen::DeleteControlBarWindow(void)
 void
 CicoHomeScreen::CreateSwipeInputWindow(void)
 {
+    int     pos_y, swipe_height;
+
     ICO_DBG("CicoHomeScreen::CreateSwipeInputWindow: start");
-    /* TODO: cullentry SwipeInput windows is fixed size, need configuration ?   */
+    /* cullentry SwipeInput windows is fixed size   */
+    pos_y = ICO_HS_WINDOW_POS_Y + ICO_HS_SWIPE_TOUCH_DISTANCE_TOP;
+    swipe_height = full_height - pos_y - ICO_HS_SWIPE_TOUCH_DISTANCE_BOTTOM;
+
     /* left side window     */
     swipe_input_windows[0] = new CicoHSSwipeInputWindow();
     swipe_input_windows[0]->
-            CreateSwipeInputWindow(ICO_HS_WINDOW_POS_X,
-                                   full_height / 2 + ICO_HS_SWIPE_TOUCH_DISTANCE_XY1,
-                                   ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH,
-                                   full_height / 2 - ICO_HS_SWIPE_TOUCH_DISTANCE_XY1
-                                                   - ICO_HS_SWIPE_TOUCH_DISTANCE_XY2,
+            CreateSwipeInputWindow(ICO_HS_WINDOW_POS_X, pos_y,
+                                   ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH, swipe_height,
                                    "left");
     swipe_input_windows[0]->ShowWindow();
 
     /* right side window    */
     swipe_input_windows[1] = new CicoHSSwipeInputWindow();
     swipe_input_windows[1]->
-            CreateSwipeInputWindow(full_width - ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH,
-                                   full_height / 2 + ICO_HS_SWIPE_TOUCH_DISTANCE_XY1,
-                                   ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH,
-                                   full_height / 2 - ICO_HS_SWIPE_TOUCH_DISTANCE_XY1
-                                                   - ICO_HS_SWIPE_TOUCH_DISTANCE_XY2,
+            CreateSwipeInputWindow(full_width - ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH, pos_y,
+                                   ICO_HS_SWIPE_TOUCH_SWIPE_WIDTH, swipe_height,
                                    "right");
     swipe_input_windows[1]->ShowWindow();