migration merge<Jiyoun Park>

[framework/uifw/elementary.git] / src / bin / test_photocam.c

diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c
index 52dd9e4..1b47915 100644 (file)
--- a/src/bin/test_photocam.c
+++ b/src/bin/test_photocam.c
@@ -100,11 +100,7 @@ static void
 my_ph_scroll(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    int x, y, w, h;
-<<<<<<< HEAD
-   elm_photocam_region_get(obj, &x, &y, &w, &h);
-=======
    elm_photocam_image_region_get(obj, &x, &y, &w, &h);
->>>>>>> remotes/origin/upstream
    printf("scroll %i %i %ix%i\n", x, y, w, h);
 }
 
@@ -178,15 +174,12 @@ my_bt_zoom_fill(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUS
 }
 
 static void
-<<<<<<< HEAD
-=======
 my_bt_gesture(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
   elm_photocam_gesture_enabled_set(data, !elm_photocam_gesture_enabled_get(data));
 }
 
 static void
->>>>>>> remotes/origin/upstream
 _photocam_mouse_wheel_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
    Evas_Object *photocam = data;
@@ -329,8 +322,6 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    elm_table_pack(tb2, bt, 2, 1, 1, 1);
    evas_object_show(bt);
 
-<<<<<<< HEAD
-=======
    box = elm_box_add(win);
    elm_box_horizontal_set(box, EINA_TRUE);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -338,15 +329,10 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    elm_table_pack(tb2, box, 0, 2, 1, 1);
    evas_object_show(box);
 
->>>>>>> remotes/origin/upstream
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Pause On/Off");
    evas_object_smart_callback_add(bt, "clicked", my_bt_pause, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-<<<<<<< HEAD
-   evas_object_size_hint_align_set(bt, 0.1, 0.9);
-   elm_table_pack(tb2, bt, 0, 2, 1, 1);
-=======
    elm_box_pack_end(box, bt);
    evas_object_show(bt);
 
@@ -355,7 +341,6 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_smart_callback_add(bt, "clicked", my_bt_gesture, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_box_pack_end(box, bt);
->>>>>>> remotes/origin/upstream
    evas_object_show(bt);
 
    box = elm_box_add(win);