TIZENIOT-2384 fix gif size difference when playing | TIZENIOT-2385 Added back key...

Change-Id: Ia3f31103a549e94c4be875712daeec6766b522da

diff --git a/res/edje/ivug-main.edc b/res/edje/ivug-main.edc
index 4ff2b75d7672b909c6e0e004c3ab61b89632f109..aca5bd2e961849bb47c80ade537d2204171dcbfa 100644 (file)
--- a/res/edje/ivug-main.edc
+++ b/res/edje/ivug-main.edc
@@ -823,6 +823,17 @@ collections {
                                        fixed: 1 0;
                                }
                        }
+                       part {
+                               name: "swallow.back";
+                               type: SWALLOW;
+                               mouse_events: 1;
+                               description {
+                                       align: 0.0 0.5;
+                                       state: "default" 0.0;
+                                       rel1 { relative: 0.0 0.0; }
+                                       rel2 { relative: 0.0 1.0; }
+                               }
+                       }
                        part {
                                name: "elm.text.title";
                                type: TEXT;
@@ -837,7 +848,7 @@ collections {
                                                min: 1 1 ;
                                        }
                                        color : 0 0 0 255;
-                                       rel1 { relative: 0.0 0.0; }
+                                       rel1 { relative: 0.01 0.0; }
                                        rel2 { relative: 0.22 1.0; }
                                        align: 0.0 0.5;
                                }

diff --git a/src/main/view/ivug-main-view.cpp b/src/main/view/ivug-main-view.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 0b8ec3c..15bac91
--- a/src/main/view/ivug-main-view.cpp
+++ b/src/main/view/ivug-main-view.cpp
@@ -45,10 +45,6 @@ typedef enum {
 #undef LOG_CAT
 #define LOG_CAT "IV-MAIN-VIEW"
 
-#define MOVE_GIF_X 140
-#define RESIZE_GIF_W 1000
-#define RESIZE_GIF_H 720
-
 // EDJE
 #define IVUG_MAIN_EDJ  full_path(EDJ_PATH, "/ivug-main.edj")
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -734,8 +730,13 @@ ivug_create_content(Evas_Object *parent, char* path)
        elm_image_animated_set(img, EINA_TRUE);
        elm_image_animated_play_set(img, EINA_TRUE);
 
-       evas_object_move(img, MOVE_GIF_X, 0);
-       evas_object_resize(img, RESIZE_GIF_W, RESIZE_GIF_H);
+       Evas_Object *win = gGetCurrentWindow();
+       int wx, wy, width, height;
+
+       evas_object_geometry_get(win, &wx, &wy, &width, &height);
+
+       evas_object_resize(img, width, height);
+
        evas_object_show(img);
        evas_object_show(ly);
 
@@ -1911,6 +1912,12 @@ SHOW_PHOTOCAM:
                }
                edje_object_signal_emit(elm_layout_edje_get(pMainView->lyContent), "hide,back,btn", "user");
                pMainView->select_bar = sel_bar;
+
+               Evas_Object *back_button = elm_button_add(sel_bar);
+               elm_object_style_set(back_button, "naviframe/end_btn/default");
+               elm_layout_content_set(sel_bar, "swallow.back", back_button);
+               elm_object_signal_callback_add(back_button, "elm,action,click", "", _on_cancel_btn_clicked, (void *)pMainView);
+
                Evas_Object *check = elm_check_add(sel_bar);
                elm_check_state_set(check, EINA_FALSE);
                elm_object_style_set(check, "default");