From: Sung-jae Park <nicesj.park@samsung.com>
Date: Thu, 6 Aug 2015 08:07:51 +0000 (+0900)
Subject: Fixed size doesn't need to send ratio.
X-Git-Tag: submit/tizen_mobile/20150903.042129~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12bb2f3c2da463fcf83522e82ccb50e752707d2c;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git

Fixed size doesn't need to send ratio.

Change-Id: I645f21e4b25992180cb940d5bf453360c0d72318
---

diff --git a/widget_viewer/src/widget.c b/widget_viewer/src/widget.c
index 556bf26..84138ac 100644
--- a/widget_viewer/src/widget.c
+++ b/widget_viewer/src/widget.c
@@ -2347,6 +2347,7 @@ EAPI int widget_viewer_feed_mouse_event(widget_h handle, widget_mouse_event_type
 			break;
 		case WIDGET_MOUSE_EVENT_ON_HOLD | WIDGET_MOUSE_EVENT_MASK:
 			cmd = CMD_GBAR_MOUSE_ON_HOLD;
+			DbgPrint("Send ON_HOLD\n");
 			break;
 		case WIDGET_MOUSE_EVENT_OFF_SCROLL | WIDGET_MOUSE_EVENT_MASK:
 			cmd = CMD_GBAR_MOUSE_OFF_SCROLL;
@@ -2420,6 +2421,7 @@ EAPI int widget_viewer_feed_mouse_event(widget_h handle, widget_mouse_event_type
 			break;
 		case WIDGET_MOUSE_EVENT_ON_HOLD | WIDGET_MOUSE_EVENT_MASK:
 			cmd = CMD_WIDGET_MOUSE_ON_HOLD;
+			DbgPrint("Send ON_HOLD\n");
 			break;
 		case WIDGET_MOUSE_EVENT_OFF_SCROLL | WIDGET_MOUSE_EVENT_MASK:
 			cmd = CMD_WIDGET_MOUSE_OFF_SCROLL;
diff --git a/widget_viewer_evas/src/widget_viewer_evas.c b/widget_viewer_evas/src/widget_viewer_evas.c
index b55d1ea..1bb49b1 100644
--- a/widget_viewer_evas/src/widget_viewer_evas.c
+++ b/widget_viewer_evas/src/widget_viewer_evas.c
@@ -1044,14 +1044,19 @@ static void gbar_down_cb(void *cbdata, Evas *e, Evas_Object *obj, void *event_in
 	if (s_info.conf.field.auto_feed) {
 		minfo.x = (double)data->down.geo.x;
 		minfo.y = (double)data->down.geo.y;
-		minfo.ratio_w = (double)data->fixed_width / (double)data->down.geo.w;
-		minfo.ratio_h = (double)data->fixed_height / (double)data->down.geo.h;
+		if (s_info.conf.field.use_fixed_size) {
+			minfo.ratio_w = 1.0f;
+			minfo.ratio_h = 1.0f;
+		} else {
+			minfo.ratio_w = (double)data->fixed_width / (double)data->down.geo.w;
+			minfo.ratio_h = (double)data->fixed_height / (double)data->down.geo.h;
+		}
 		widget_viewer_feed_mouse_event(data->handle, WIDGET_GBAR_MOUSE_SET, &minfo);
 	} else {
 		minfo.x = (double)(down->canvas.x - data->down.geo.x);
 		minfo.y = (double)(down->canvas.y - data->down.geo.y);
 
-		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 			minfo.ratio_w = (double)data->fixed_width / (double)data->down.geo.w;
 			minfo.ratio_h = (double)data->fixed_height / (double)data->down.geo.h;
 		} else {
@@ -1089,7 +1094,7 @@ static void gbar_move_cb(void *cbdata, Evas *e, Evas_Object *obj, void *event_in
 		minfo.x = (double)(move->cur.canvas.x - x);
 		minfo.y = (double)(move->cur.canvas.y - y);
 
-		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 			minfo.ratio_w = (double)data->fixed_width / (double)w;
 			minfo.ratio_h = (double)data->fixed_height / (double)h;
 		} else {
@@ -1200,7 +1205,7 @@ static void gbar_up_cb(void *cbdata, Evas *e, Evas_Object *obj, void *event_info
 		minfo.x = (double)up->canvas.x;
 		minfo.y = (double)up->canvas.y;
 
-		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 			minfo.ratio_w = (double)data->fixed_width / (double)w;
 			minfo.ratio_h = (double)data->fixed_height / (double)h;
 		} else {
@@ -1213,7 +1218,7 @@ static void gbar_up_cb(void *cbdata, Evas *e, Evas_Object *obj, void *event_info
 		minfo.x = (double)(up->canvas.x - x);
 		minfo.y = (double)(up->canvas.y - y);
 
-		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 			minfo.ratio_w = (double)data->fixed_width / (double)w;
 			minfo.ratio_h = (double)data->fixed_height / (double)h;
 		} else {
@@ -1277,15 +1282,20 @@ static void __widget_down_cb(void *cbdata, Evas *e, Evas_Object *obj, void *even
 		if (s_info.conf.field.auto_feed && data->is.field.mouse_event) {
 			minfo.x = (double)data->down.geo.x;
 			minfo.y = (double)data->down.geo.y;
-			minfo.ratio_w = (double)data->fixed_width / (double)data->down.geo.w;
-			minfo.ratio_h = (double)data->fixed_height / (double)data->down.geo.h;
+			if (!s_info.conf.field.use_fixed_size) {
+				minfo.ratio_w = (double)data->fixed_width / (double)data->down.geo.w;
+				minfo.ratio_h = (double)data->fixed_height / (double)data->down.geo.h;
+			} else {
+				minfo.ratio_w = 1.0f;
+				minfo.ratio_h = 1.0f;
+			}
 			DbgPrint("%lfx%lf (%lfx%lf), %dx%d %dx%d\n", minfo.x, minfo.y, minfo.ratio_w, minfo.ratio_h, data->fixed_width, data->fixed_height, data->down.geo.w, data->down.geo.h);
 			widget_viewer_feed_mouse_event(data->handle, WIDGET_MOUSE_SET, &minfo);
 		} else {
 			minfo.x = (double)(data->x - data->down.geo.x);
 			minfo.y = (double)(data->y - data->down.geo.y);
 
-			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 				minfo.ratio_w = (double)data->fixed_width / (double)data->down.geo.w;
 				minfo.ratio_h = (double)data->fixed_height / (double)data->down.geo.h;
 			} else {
@@ -2834,7 +2844,7 @@ static void __widget_up_cb(void *cbdata, Evas *e, Evas_Object *obj, void *event_
 		minfo.x = (double)(data->x - x);
 		minfo.y = (double)(data->y - y);
 
-		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 			minfo.ratio_w = (double)data->fixed_width / (double)w;
 			minfo.ratio_h = (double)data->fixed_height / (double)h;
 		} else {
@@ -2866,7 +2876,7 @@ static void __widget_up_cb(void *cbdata, Evas *e, Evas_Object *obj, void *event_
 			_minfo.y = (double)up->canvas.y;
 			DbgPrint("X,Y = %lfx%lf\n", _minfo.x, _minfo.y);
 
-			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 				_minfo.ratio_w = (double)data->fixed_width / (double)data->down.geo.w;
 				_minfo.ratio_h = (double)data->fixed_height / (double)data->down.geo.h;
 				DbgPrint("Width: %d/%d - Height: %d/%d\n", data->fixed_width, data->down.geo.w, data->fixed_height, data->down.geo.h);
@@ -2884,7 +2894,7 @@ static void __widget_up_cb(void *cbdata, Evas *e, Evas_Object *obj, void *event_
 				minfo.x = (double)(data->down.x - x);
 				minfo.y = (double)(data->down.y - y);
 
-				if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+				if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 					minfo.ratio_w = (double)data->fixed_width / (double)w;
 					minfo.ratio_h = (double)data->fixed_height / (double)h;
 				} else {
@@ -2977,7 +2987,7 @@ static void __widget_move_cb(void *cbdata, Evas *e, Evas_Object *obj, void *even
 			minfo.x = (double)(data->x - x);
 			minfo.y = (double)(data->y - y);
 
-			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 				minfo.ratio_w = (double)data->fixed_width / (double)w;
 				minfo.ratio_h = (double)data->fixed_height / (double)h;
 			} else {
@@ -3007,7 +3017,7 @@ static void __widget_move_cb(void *cbdata, Evas *e, Evas_Object *obj, void *even
 			minfo.x = (double)(data->x - x);
 			minfo.y = (double)(data->y - y);
 
-			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 				minfo.ratio_w = (double)data->fixed_width / (double)w;
 				minfo.ratio_h = (double)data->fixed_height / (double)h;
 			} else {
@@ -3783,7 +3793,7 @@ static int do_force_mouse_up(struct widget_data *data)
 	minfo.x = (double)(data->x - x);
 	minfo.y = (double)(data->y - y);
 
-	if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+	if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 		minfo.ratio_w = (double)data->fixed_width / (double)w;
 		minfo.ratio_h = (double)data->fixed_height / (double)h;
 	} else {
@@ -3812,7 +3822,7 @@ static int do_force_mouse_up(struct widget_data *data)
 		minfo.y = (double)data->y;
 		DbgPrint("X,Y = %lfx%lf\n", minfo.x, minfo.y);
 
-		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+		if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 			minfo.ratio_w = (double)data->fixed_width / (double)data->down.geo.w;
 			minfo.ratio_h = (double)data->fixed_height / (double)data->down.geo.h;
 			DbgPrint("Width: %d/%d - Height: %d/%d\n", data->fixed_width, data->down.geo.w, data->fixed_height, data->down.geo.h);
@@ -3829,7 +3839,7 @@ static int do_force_mouse_up(struct widget_data *data)
 			/* We have to keep the first position of touch down */
 			minfo.x = (double)(data->down.x - x);
 			minfo.y = (double)(data->down.y - y);
-			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN) {
+			if (data->size_type != WIDGET_SIZE_TYPE_UNKNOWN && !s_info.conf.field.use_fixed_size) {
 				minfo.ratio_w = (double)data->fixed_width / (double)w;
 				minfo.ratio_h = (double)data->fixed_height / (double)h;
 			} else {
@@ -3918,6 +3928,7 @@ static void __widget_move(Evas_Object *widget, Evas_Coord x, Evas_Coord y)
 			rx = 0.5f;
 			break;
 		}
+
 		if (prev_y + widget_h + gbar_h > s_info.screen_height) {
 			ry = 1.0f;
 		} else {