diff options
author | jin0.kim <jin0.kim@samsung.com> | 2017-04-27 19:49:49 +0830 |
---|---|---|
committer | jin0.kim <jin0.kim@samsung.com> | 2017-04-27 20:01:17 +0830 |
commit | 3e8cae145c314b182b6491357da10243cfc7d35c (patch) | |
tree | 707830d971d445e16bafb085bd8740daf070274f | |
parent | 7b7279402e0fc55f5d6bf5faf6ecd3116f748a4c (diff) | |
download | w3-home-3e8cae145c314b182b6491357da10243cfc7d35c.tar.gz w3-home-3e8cae145c314b182b6491357da10243cfc7d35c.tar.bz2 w3-home-3e8cae145c314b182b6491357da10243cfc7d35c.zip |
update center layout GUI
Change-Id: I57d3aec63f370c7fff475530c075ebed062bdc9b
-rwxr-xr-x | inc/moments/moments.h | 1 | ||||
-rwxr-xr-x | inc/moments/moments_view.h | 8 | ||||
-rwxr-xr-x | inc/moments/moments_view_conf.h | 15 | ||||
-rwxr-xr-x | inc/moments/moments_view_edje_conf.h | 7 | ||||
-rwxr-xr-x | res/edje/circle/moments_center_layout.edc | 246 | ||||
-rwxr-xr-x | res/edje/images/b_moment_3g_more_opt_bluetooth_ic.png | bin | 0 -> 2955 bytes | |||
-rwxr-xr-x | res/edje/images/b_moment_3g_more_opt_remotely_ic.png | bin | 0 -> 3112 bytes | |||
-rwxr-xr-x | res/edje/images/b_moment_3g_more_opt_standalone_ic.png | bin | 0 -> 3632 bytes | |||
-rwxr-xr-x | src/moments/moments_view.c | 52 | ||||
-rwxr-xr-x | test/feature_test/group_feature_moments_default_ui.c | 85 | ||||
-rwxr-xr-x | test/feature_test/group_feature_moments_pull_down.c | 4 | ||||
-rwxr-xr-x | test/feature_test/group_feature_status_area_layer_show.c | 6 | ||||
-rwxr-xr-x | test/test_function.h | 5 |
13 files changed, 413 insertions, 16 deletions
diff --git a/inc/moments/moments.h b/inc/moments/moments.h index 3d88c12..1f7e5a5 100755 --- a/inc/moments/moments.h +++ b/inc/moments/moments.h @@ -28,5 +28,6 @@ void moments_show(void); void moments_hide(void); void moments_move(int from_y, int to_y); void moments_put_down(void); +void moments_view_update(void); #endif diff --git a/inc/moments/moments_view.h b/inc/moments/moments_view.h index 9ddf308..8f47695 100755 --- a/inc/moments/moments_view.h +++ b/inc/moments/moments_view.h @@ -29,6 +29,14 @@ typedef struct { double duration; } MOVEMENT; + +typedef enum { + MOMENTS_CONNECTION_STATUS_STANDALONE, + MOMENTS_CONNECTION_STATUS_CONNECTED_BLUETOOTH, + MOMENTS_CONNECTION_STATUS_CONNECTED_REMOTELY, + MOMENTS_CONNECTION_STATUS_MAX, +} moments_connection_status_e; + Evas_Object *moments_create_ui(Evas_Object *base_win); void moments_destroy_ui(void); diff --git a/inc/moments/moments_view_conf.h b/inc/moments/moments_view_conf.h index 9746df7..3c01921 100755 --- a/inc/moments/moments_view_conf.h +++ b/inc/moments/moments_view_conf.h @@ -33,6 +33,21 @@ #define MOMENTS_CENTER_W (int)((260) * (SCALE_W)) #define MOMENTS_CENTER_H (int)((180) * (SCALE_H)) +#define MOMENTS_CENTER_STATUS_ICON_W (int)((30) * (SCALE_W)) +#define MOMENTS_CENTER_STATUS_ICON_H (int)((38) * (SCALE_W)) +#define MOMENTS_CENTER_STATUS_ICON_X (int)((WINDOW_H - MOMENTS_CENTER_STATUS_ICON_W)/2 * (SCALE_W)) +#define MOMENTS_CENTER_STATUS_ICON_Y (int)((64) * (SCALE_W)) + +#define MOMENTS_CENTER_STATUS_TEXT_W (int)((260) * (SCALE_W)) +#define MOMENTS_CENTER_STATUS_TEXT_H (int)((74) * (SCALE_W)) +#define MOMENTS_CENTER_STATUS_TEXT_X (int)((50) * (SCALE_W)) +#define MOMENTS_CENTER_STATUS_TEXT_Y (int)((102) * (SCALE_W)) + +#define MOMENTS_CENTER_PLMN_TEXT_W (int)((260) * (SCALE_W)) +#define MOMENTS_CENTER_PLMN_TEXT_H (int)((68) * (SCALE_W)) +#define MOMENTS_CENTER_PLMN_TEXT_X (int)((50) * (SCALE_W)) +#define MOMENTS_CENTER_PLMN_TEXT_Y (int)((176) * (SCALE_W)) + #define MOMENTS_BUTTON_W (int)((64) * (SCALE_H)) #define MOMENTS_BUTTON_H (int)((64) * (SCALE_H)) #define MOMENTS_BUTTON_1_X (int)((148) * (SCALE_H)) diff --git a/inc/moments/moments_view_edje_conf.h b/inc/moments/moments_view_edje_conf.h index dbcf77a..34e9269 100755 --- a/inc/moments/moments_view_edje_conf.h +++ b/inc/moments/moments_view_edje_conf.h @@ -24,6 +24,13 @@ #define MOMENTS_CONTENT "moments_content" #define STATUS_CONTENT "status_content" #define CENTER_LAYOUT "center_layout" +#define CENTER_GROUP_STATUS_STANDALONE "center_status_standalone" +#define CENTER_GROUP_STATUS_BLUETOOTH "center_status_bluetooth" +#define CENTER_GROUP_STATUS_REMOTELY "center_status_remotely" +#define CENTER_STATUS_ICON "center_status_icon" +#define CENTER_STATUS_TEXT "center_status_text" +#define CENTER_PLMN_TEXT "plmn_text" + #define BUTTON_LAYOUT "button_layout" #define SIGNAL_SOURCE "signal_source" diff --git a/res/edje/circle/moments_center_layout.edc b/res/edje/circle/moments_center_layout.edc new file mode 100755 index 0000000..679718d --- /dev/null +++ b/res/edje/circle/moments_center_layout.edc @@ -0,0 +1,246 @@ +/* + * Copyright (c) 2013 Samsung Electronics Co., Ltd. + * + * Licensed under the Flora License, Version 1.1 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "../../../inc/moments/moments_view_edje_conf.h" + +images { + image: "b_moment_3g_more_opt_standalone_ic.png" COMP; + image: "b_moment_3g_more_opt_bluetooth_ic.png" COMP; + image: "b_moment_3g_more_opt_remotely_ic.png" COMP; + +} + +collections { + styles { + style { + name: "connection_status_text_style"; + base: "font=Tizen text_class=tizen font_size=28 align=center color=#FFFFFF wrap=word"; + tag: "br" "\n"; + tag: "hilight" "+ font=Tizen:style=Medium"; + tag: "b" "+ font=Tizen:style=Medium"; + tag: "tab" "\t"; + } + style { + name: "plmn_text_style"; + base: "font=Tizen text_class=tizen font_size=24 align=center color=#FFFFFF wrap=word"; + tag: "br" "\n"; + tag: "hilight" "+ font=Tizen:style=Medium"; + tag: "b" "+ font=Tizen:style=Medium"; + tag: "tab" "\t"; + } + } + + group { CENTER_GROUP_STATUS_STANDALONE; + parts { + part { + name: SIZE_SETTER; + type: SPACER; + mouse_events: 0; + repeat_events: 0; + description { + state: "default" 0.0; + align: 0 0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + } + } + part { + name: CENTER_STATUS_ICON; + type: IMAGE; + description { + state: "default" 0.0; + align: 0.5 0.0; + rel1 { relative: 0.4424 0.0; to: SIZE_SETTER;} + rel2 { relative: 0.5577 0.2112; to: SIZE_SETTER;} + image { + normal: "b_moment_3g_more_opt_standalone_ic.png"; + border: 0 0 0 0; + } + color: 255 255 255 255; + } + } + part { + name: CENTER_STATUS_TEXT; + type: TEXTBLOCK; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.2112; to: SIZE_SETTER;} + rel2 { relative: 1.0 0.6223; to: SIZE_SETTER;} + text { + text: "Standalone"; + style: "connection_status_text_style"; + min: 0 0; + align: 0.5 0.5; + } + } + } + part { + name: CENTER_PLMN_TEXT; + type: TEXTBLOCK; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.6223; to: SIZE_SETTER;} + rel2 { relative: 1.0 1.0; to: SIZE_SETTER;} + text { + text: "Emergency<br>calls only"; + style: "plmn_text_style"; + min: 0 0; + align: 0.5 0.5; + } + } + } + } + } + group { CENTER_GROUP_STATUS_BLUETOOTH; + parts { + part { + name: SIZE_SETTER; + type: SPACER; + mouse_events: 0; + repeat_events: 0; + description { + state: "default" 0.0; + align: 0 0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + } + } + part { + name: CENTER_STATUS_ICON; + type: IMAGE; + description { + state: "default" 0.0; + align: 0.5 0.0; + rel1 { relative: 0.4424 0.0; to: SIZE_SETTER;} + rel2 { relative: 0.5577 0.2112; to: SIZE_SETTER;} + image { + normal: "b_moment_3g_more_opt_bluetooth_ic.png"; + border: 0 0 0 0; + } + color: 255 255 255 255; + } + } + part { + name: CENTER_STATUS_TEXT; + type: TEXTBLOCK; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.2112; to: SIZE_SETTER;} + rel2 { relative: 1.0 0.6223; to: SIZE_SETTER;} + text { + text: "Connected<br/>via bluetooth"; + style: "connection_status_text_style"; + min: 0 0; + align: 0.5 0.5; + } + } + } + part { + name: CENTER_PLMN_TEXT; + type: TEXTBLOCK; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.6223; to: SIZE_SETTER;} + rel2 { relative: 1.0 1.0; to: SIZE_SETTER;} + text { + text: "PLMN/SPN"; + style: "plmn_text_style"; + min: 0 0; + align: 0.5 0.5; + } + } + } + } + } + group { CENTER_GROUP_STATUS_REMOTELY; + parts { + part { + name: SIZE_SETTER; + type: SPACER; + mouse_events: 0; + repeat_events: 0; + description { + state: "default" 0.0; + align: 0 0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + } + } + part { + name: CENTER_STATUS_ICON; + type: IMAGE; + description { + state: "default" 0.0; + align: 0.5 0.0; + rel1 { relative: 0.4424 0.0; to: SIZE_SETTER;} + rel2 { relative: 0.5577 0.2112; to: SIZE_SETTER;} + image { + normal: "b_moment_3g_more_opt_remotely_ic.png"; + border: 0 0 0 0; + } + color: 255 255 255 255; + } + } + part { + name: CENTER_STATUS_TEXT; + type: TEXTBLOCK; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.2112; to: SIZE_SETTER;} + rel2 { relative: 1.0 0.6223; to: SIZE_SETTER;} + text { + text: "Connected remotely"; + style: "connection_status_text_style"; + min: 0 0; + align: 0.5 0.5; + } + } + } + part { + name: CENTER_PLMN_TEXT; + type: TEXTBLOCK; + mouse_events: 1; + repeat_events: 1; + description { + state: "default" 0.0; + rel1 { relative: 0.0 0.6223; to: SIZE_SETTER;} + rel2 { relative: 1.0 1.0; to: SIZE_SETTER;} + text { + text: "PLMN/SPN"; + style: "plmn_text_style"; + min: 0 0; + align: 0.5 0.5; + } + } + } + } + } + + + +} + + diff --git a/res/edje/images/b_moment_3g_more_opt_bluetooth_ic.png b/res/edje/images/b_moment_3g_more_opt_bluetooth_ic.png Binary files differnew file mode 100755 index 0000000..b3799df --- /dev/null +++ b/res/edje/images/b_moment_3g_more_opt_bluetooth_ic.png diff --git a/res/edje/images/b_moment_3g_more_opt_remotely_ic.png b/res/edje/images/b_moment_3g_more_opt_remotely_ic.png Binary files differnew file mode 100755 index 0000000..58be511 --- /dev/null +++ b/res/edje/images/b_moment_3g_more_opt_remotely_ic.png diff --git a/res/edje/images/b_moment_3g_more_opt_standalone_ic.png b/res/edje/images/b_moment_3g_more_opt_standalone_ic.png Binary files differnew file mode 100755 index 0000000..ba11b67 --- /dev/null +++ b/res/edje/images/b_moment_3g_more_opt_standalone_ic.png diff --git a/src/moments/moments_view.c b/src/moments/moments_view.c index 3acc386..c18a855 100755 --- a/src/moments/moments_view.c +++ b/src/moments/moments_view.c @@ -27,11 +27,14 @@ #include "moments/moments_view.h" #include "moments/moments_view_conf.h" #include "moments/moments_view_edje_conf.h" + #include "layout.h" #include "app_log.h" #define BASE_LAYOUT_EDJE EDJE_DIR"/circle/moments_layout.edj" #define STATUS_LAYOUT_EDJE EDJE_DIR"/circle/moments_status_layout.edj" +#define CENTER_LAYOUT_EDJE EDJE_DIR"/circle/moments_center_layout.edj" +#define CONTROL_BUTTON_LAYOUT_EDJE EDJE_DIR"/circle/moments_control_button_layout.edj" static struct __view_s { Evas_Object *win; @@ -61,6 +64,15 @@ static struct __view_s { .is_show = false, }; +const char *center_layout_group_name[MOMENTS_CONNECTION_STATUS_MAX] = { + CENTER_GROUP_STATUS_STANDALONE, + CENTER_GROUP_STATUS_BLUETOOTH, + CENTER_GROUP_STATUS_REMOTELY +}; + + +moments_connection_status_e connection_status = 0; + extern void moments_view_animator_move(Evas_Object *layout[2], MOVEMENT info[2], void(*cb)(void)); static Evas_Object *__create_base_layout(Evas_Object *parent); @@ -70,6 +82,7 @@ static Evas_Object *__create_center_layout(Evas_Object *base_layout); static Evas_Object *__create_button_grid(Evas_Object *base_layout); static Evas_Object *__create_button_object(Evas_Object *base_layout); static void __adjust_content_alpha(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void __set_center_contents(void); static void __put_down(void); static void __freeze_touch_event(void); @@ -221,6 +234,12 @@ void moments_view_move(int from_y, int to_y) evas_object_move(s_info.background_layout, 0, y); } + +void moments_view_update() +{ + __set_center_contents(); +} + void moments_view_put_down(void) { _D("%s", __func__); @@ -268,23 +287,38 @@ static Evas_Object *__create_base_size_setter(Evas_Object *base_layout) static Evas_Object *__create_center_layout(Evas_Object *base_layout) { - Evas_Object * center_layout = evas_object_rectangle_add(evas_object_evas_get(base_layout)); - if (!center_layout) { + Evas_Object *center_layout = NULL; + + center_layout = elm_layout_add(base_layout); + if (!center_layout|| !elm_layout_file_set(center_layout, util_get_res_file_path(CENTER_LAYOUT_EDJE), CENTER_GROUP_STATUS_STANDALONE)) { _E("Failed to create center layout"); - return NULL; + goto __fail; } - evas_object_size_hint_min_set(center_layout, MOMENTS_CENTER_W, MOMENTS_CENTER_H); evas_object_size_hint_weight_set(center_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(center_layout, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_color_set(center_layout, 0, 0, 255, 200); - elm_object_part_content_set(base_layout, CENTER_LAYOUT, center_layout); evas_object_show(center_layout); + elm_object_part_content_set(base_layout, CENTER_LAYOUT, center_layout); + return center_layout; + +__fail: + if (center_layout) evas_object_del(center_layout); + return NULL; +} + + +static void __set_center_contents() +{ + elm_layout_file_set(s_info.center_layout, util_get_res_file_path(CENTER_LAYOUT_EDJE), center_layout_group_name[connection_status]); + + //elm_object_part_text_set(center_layout, CENTER_STATUS_TEXT, "Connected<br/>via Bluetooth"); + //elm_object_part_text_set(center_layout, CENTER_PLMN_TEXT, "PLMN/SPN"); } + static Evas_Object *__create_status_layout(Evas_Object *parent) { Evas_Object *layout = NULL; @@ -329,7 +363,6 @@ static Evas_Object *__create_button_grid(Evas_Object *base_layout) static Evas_Object *__create_button_object(Evas_Object *base_layout) { - Evas_Object * button = evas_object_rectangle_add(evas_object_evas_get(base_layout)); evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_color_set(button, 255, 255, 255, 255); @@ -625,5 +658,10 @@ int __t__get_center_layout_alpha(int layout_bottom) return __get_center_layout_alpha(layout_bottom); } +void __t__set_connection_status(int status) +{ + connection_status = status; +} + #endif diff --git a/test/feature_test/group_feature_moments_default_ui.c b/test/feature_test/group_feature_moments_default_ui.c index 2c73de3..ab4afff 100755 --- a/test/feature_test/group_feature_moments_default_ui.c +++ b/test/feature_test/group_feature_moments_default_ui.c @@ -3,41 +3,67 @@ #include "feature_test.h" #include "moments/moments.h" +#include "moments/moments_view.h" #include "common_conf.h" #include "moments/moments_view_conf.h" +#include "moments/moments_view_edje_conf.h" #include "home_app_manager.h" #include "../test_function.h" #include <Elementary.h> #include <app.h> - - +static void __case_set_connection_status_and_check_layout(bool * is_passed); static void __case_check_center_layout(bool * is_passed); static void __case_check_button_layout(bool * is_passed); - +static void __case_restore_status(bool * is_passed); static struct { Ecore_Timer * group_timer; unit_group_t * group; int current_case; + int current_step; void(*case_pool[TEST_CASE_MAX + 1])(bool * is_passed); } s_info = { .group_timer = NULL, .group = NULL, .current_case = 0, + .current_step = 0, .case_pool = { + __case_set_connection_status_and_check_layout, __case_check_center_layout, + __case_restore_status, __case_check_button_layout, NULL, }, }; +extern const char *center_layout_group_name[MOMENTS_CONNECTION_STATUS_MAX]; + static Eina_Bool __group_timer_callback(void * data); static void __set_up(void) {} static void __tear_down(void) {} +static void __case_set_connection_status_and_check_layout(bool * is_passed) +{ + __t__set_connection_status(MOMENTS_CONNECTION_STATUS_STANDALONE + s_info.current_step); + + moments_view_update(); + + Evas_Object * center_layout = __t__get_moments_center_layout(); + TEST_ASSERT_TRUE(center_layout != NULL); + TEST_ASSERT_TRUE(evas_object_visible_get(center_layout)); + + const char *group = NULL; + + elm_layout_file_get(center_layout, NULL, &group); + + TEST_ASSERT_EQUAL_STRING(center_layout_group_name[s_info.current_step], group); + + *is_passed = true; +} + static void __case_check_center_layout(bool * is_passed) { Evas_Object * size_setter = __t__get_moments_size_setter(); @@ -63,6 +89,59 @@ static void __case_check_center_layout(bool * is_passed) TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_X, x); TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_Y, y); + Evas_Object * eo = elm_layout_edje_get(center_layout); + + Evas_Object * icon = (Evas_Object *)edje_object_part_object_get(eo, CENTER_STATUS_ICON); + TEST_ASSERT_TRUE(icon != NULL); + TEST_ASSERT_TRUE(evas_object_visible_get(icon)); + + evas_object_geometry_get(icon, &x, &y, &w, &h); + + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_STATUS_ICON_W, w); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_STATUS_ICON_H, h); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_STATUS_ICON_X, x); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_STATUS_ICON_Y, y); + + + Evas_Object * status_text = (Evas_Object *)edje_object_part_object_get(eo, CENTER_STATUS_TEXT); + TEST_ASSERT_TRUE(status_text != NULL); + TEST_ASSERT_TRUE(evas_object_visible_get(status_text)); + + evas_object_geometry_get(status_text, &x, &y, &w, &h); + + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_STATUS_TEXT_W, w); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_STATUS_TEXT_H, h); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_STATUS_TEXT_X, x); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_STATUS_TEXT_Y, y); + + + Evas_Object * plmn_text = (Evas_Object *)edje_object_part_object_get(eo, CENTER_PLMN_TEXT); + TEST_ASSERT_TRUE(plmn_text != NULL); + TEST_ASSERT_TRUE(evas_object_visible_get(plmn_text)); + + evas_object_geometry_get(plmn_text, &x, &y, &w, &h); + + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_PLMN_TEXT_W, w); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_PLMN_TEXT_H, h); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_PLMN_TEXT_X, x); + TEST_ASSERT_EQUAL_INT(MOMENTS_CENTER_PLMN_TEXT_Y, y); + + s_info.current_step += 1; + + if (s_info.current_step < MOMENTS_CONNECTION_STATUS_MAX) { + s_info.current_case -= 2; + } + + *is_passed = true; +} + + +static void __case_restore_status(bool * is_passed) +{ + __t__set_connection_status(MOMENTS_CONNECTION_STATUS_STANDALONE); + + moments_view_update(); + *is_passed = true; } diff --git a/test/feature_test/group_feature_moments_pull_down.c b/test/feature_test/group_feature_moments_pull_down.c index fc15633..b41837e 100755 --- a/test/feature_test/group_feature_moments_pull_down.c +++ b/test/feature_test/group_feature_moments_pull_down.c @@ -88,8 +88,8 @@ static void __set_up(void) {} static void __tear_down(void) {} -static const int start_x = 180; -static const int start_y = 50; +const int start_x = 180; +const int start_y = 50; static void __case_touch_down_top(bool * is_passed) { diff --git a/test/feature_test/group_feature_status_area_layer_show.c b/test/feature_test/group_feature_status_area_layer_show.c index 4d7c9fd..f6bb3d3 100755 --- a/test/feature_test/group_feature_status_area_layer_show.c +++ b/test/feature_test/group_feature_status_area_layer_show.c @@ -6,7 +6,7 @@ #include "home_app_manager.h" #include "common_conf.h" #include "moments/moments_view_conf.h" - +#include "../test_function.h" #include <Elementary.h> #include <app.h> @@ -42,8 +42,8 @@ static void __set_up(void) {} static void __tear_down(void) {} -static int touch_x[10] = { 180, 101, 259, 180, 180, 0 }; -static int touch_y[10] = { 50, 50, 50, 89, 0, 0 }; +const int touch_x[10] = { 180, 101, 259, 180, 180, 0 }; +const int touch_y[10] = { 50, 50, 50, 89, 0, 0 }; static void __case_touch_down_top(bool * is_passed) diff --git a/test/test_function.h b/test/test_function.h index d5f0b70..012a2e5 100755 --- a/test/test_function.h +++ b/test/test_function.h @@ -16,17 +16,20 @@ extern Evas_Object * __t__get_moments_size_setter(void); extern Evas_Object * __t__get_moments_button_grid(void); extern Evas_Object * __t__get_moments_button_object(void); + extern void __t__layout_mouse_down(Evas_Object *layout, int down_x, int down_y); extern void __t__layout_mouse_move(Evas_Object *layout, int cur_x, int cur_y); extern void __t__layout_mouse_up(Evas_Object *layout, int up_x, int up_y); extern void __t__background_layout_mouse_down(int down_x, int down_y); +extern void __t__background_layout_mouse_move(int cur_x, int cur_y); +extern void __t__background_layout_mouse_up(int up_x, int up_y); extern void __t__get_dest_y(int from_y, int to_y, int * dest_y); extern void __t__get_draw_up_view_y(int from_y, int to_y, int * dest_y); extern void __t__get_draw_down_view_y(int from_y, int to_y, int * dest_y); extern int __t__get_button_grid_alpha(int layout_bottom); extern int __t__get_center_layout_alpha(int layout_bottom); - +extern void __t__set_connection_status(int status); #endif #endif |