hide zoom slider at some caces, show video thumbnail

Change-Id: I138bee935eec6744206a984c9a339f16f9ab72c1

diff --git a/main/src/slider/ivug-slider-item.cpp b/main/src/slider/ivug-slider-item.cpp
index d78cdf9..cb89f93 100755 (executable)
--- a/main/src/slider/ivug-slider-item.cpp
+++ b/main/src/slider/ivug-slider-item.cpp
@@ -218,6 +218,7 @@ static bool _set_mitem(Slide_Item* si, Media_Item *item)
        }
        else if ( si->type == SITEM_TYPE_VIDEO )
        {
+                _show_thumbnail(si, mdata->thumbnail_path);
                elm_image_file_set(si->vIcon, EDJ_PATH"/ivug-icons.edj", "btn.video.play");
                _show_videoicon(si);
        }

diff --git a/main/src/view/ivug-main-view.cpp b/main/src/view/ivug-main-view.cpp
index 4b9ea37..87ac50c 100755 (executable)
--- a/main/src/view/ivug-main-view.cpp
+++ b/main/src/view/ivug-main-view.cpp
@@ -290,14 +290,12 @@ void _ivug_main_on_mmc_state_changed(keynode_t* node, void *data)
        }
 }
 
-static void _show_zoom_icon(void *data)
+static void _show_zoom_icon(Ivug_MainView *pMainView)
 {
-       ivug_ret_if(!data);
+       ivug_ret_if(!pMainView);
 
        MSG_MAIN_ERROR("_show_zoom_icon");
 
-       Ivug_MainView *pMainView = (Ivug_MainView *)data;
-
        /*unsigned int zoom_level = ivug_slider_zoom_level_get(pMainView->slider);
        if(zoom_level == 0)
        {
@@ -318,6 +316,17 @@ static void _show_zoom_icon(void *data)
        edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,zoom_slider,show","elm");
 }
 
+static void _hide_zoom_icon(Ivug_MainView *pMainView)
+{
+       ivug_ret_if(!pMainView);
+
+       MSG_MAIN_ERROR("_hide_zoom_icon");
+
+       edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_out,hide","elm");
+       edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_in,hide","elm");
+       edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,zoom_slider,hide","elm");
+}
+
 static void _update_main_view(Ivug_MainView *pMainView)
 {
        IV_ASSERT(pMainView != NULL);
@@ -337,7 +346,16 @@ static void _update_main_view(Ivug_MainView *pMainView)
 
        PERF_CHECK_END(LVL6, "Set menu title");
 
-       _show_zoom_icon(pMainView);
+       slide_state_t state = ivug_slider_get_state(pMainView->slider);
+
+       if(mdata->slide_type == SLIDE_TYPE_IMAGE && mdata->bIsDRMContent == false && state != SLIDE_STATE_ERROR)
+       {
+               _show_zoom_icon(pMainView);
+       }
+       else
+       {
+               _hide_zoom_icon(pMainView);
+       }
 
        return;
 }
@@ -1067,7 +1085,7 @@ _ivug_main_view_zoom_out_cb(void *data, Evas_Object *obj, const char *emission,
                ivug_main_view_set_hide_timer(pMainView);
        }
 
-       _show_zoom_icon(data);
+       _show_zoom_icon(pMainView);
 }
 
 static void
@@ -1093,7 +1111,7 @@ _ivug_main_view_zoom_in_cb(void *data, Evas_Object *obj, const char *emission, c
                ivug_main_view_set_hide_timer(pMainView);
        }
 
-       _show_zoom_icon(data);
+       _show_zoom_icon(pMainView);
 }
 
 static void _zoom_slider_change_cb(void *data, Evas_Object *obj, void *event_info)
@@ -1661,9 +1679,7 @@ ivug_main_view_hide_menu_bar(Ivug_MainView *pMainView)
        elm_object_item_signal_emit(pMainView->navi_it, "elm,state,toolbar,close", "");
 
        // zoom icon
-       edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_out,hide","elm");
-       edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,btn_zoom_in,hide","elm");
-       edje_object_signal_emit(_EDJ(pMainView->empty_layout), "elm,state,zoom_slider,hide","elm");
+       _hide_zoom_icon(pMainView);
 
        ivug_slider_set_menu_visibility(pMainView->slider, EINA_FALSE);