This patch solves-

JIRA TIZENIOT-1356 [Music] Change location of the library tabs

Change-Id: Id29a81c512e06b5d8abd1519dfe8556c06a7664f
Signed-off-by: Jagrat Patidar <j1.patidar@samsung.com>

diff --git a/res/edje/mp-view.edc b/res/edje/mp-view.edc
index 5145dfa17b37c641e1e831fa816262efb961176e..2f27469ed3f10876ec731656fa799f93f3a939aa 100755 (executable)
--- a/res/edje/mp-view.edc
+++ b/res/edje/mp-view.edc
@@ -288,8 +288,8 @@ group { name: "common_view_layout";
             scale: 1;
             description { state: "default" 0.0;
                fixed: 0 1;
-               rel1 { relative: 0.0 0.0; }
-               rel2 { relative: 1.0 0.072; }
+               rel1 { relative: 0.0 0.875; }
+               rel2 { relative: 1.0 1.0; }
                align: 0.5 0.0;
             }
          }
@@ -297,8 +297,8 @@ group { name: "common_view_layout";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               rel1.to_y: "tabbar";
-               rel1.relative: 0.0 1.0;
+               rel1 { relative: 0.0 0.0; }
+               rel2 { relative: 1.0 0.875; }
             }
          }
       }

diff --git a/src/common/mp-widget.c b/src/common/mp-widget.c
index c1546def04f1cbe70566f675fc1f25307712adb7..756f03cdda93d147e881e9d1ea2a5caaee7feb85 100755 (executable)
--- a/src/common/mp-widget.c
+++ b/src/common/mp-widget.c
@@ -190,13 +190,12 @@ Evas_Object *mp_widget_create_tabbar(Evas_Object * obj)
        PROFILE_IN("elm_toolbar_add");
        tabbar = elm_toolbar_add(obj);
        PROFILE_OUT("elm_toolbar_add");
-       elm_toolbar_shrink_mode_set(tabbar, ELM_TOOLBAR_SHRINK_SCROLL);
+       elm_toolbar_shrink_mode_set(tabbar, ELM_TOOLBAR_SHRINK_EXPAND);
        elm_toolbar_reorder_mode_set(tabbar, EINA_FALSE);
        elm_toolbar_transverse_expanded_set(tabbar, EINA_TRUE);
        elm_toolbar_select_mode_set(tabbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
-
        PROFILE_IN("elm_object_style_set: toolbar");
-       elm_object_style_set(tabbar, "scroll/tabbar_with_title");
+       elm_object_style_set(tabbar, "tabbar");
        PROFILE_OUT("elm_object_style_set: toolbar");
 
        return tabbar;

diff --git a/src/widget/mp-now-playing.c b/src/widget/mp-now-playing.c
index 3424bad243476679d02454694d23e6576f046a1c..64801f66754bd10ab5fc6110c6791cf8d379620d 100755 (executable)
--- a/src/widget/mp-now-playing.c
+++ b/src/widget/mp-now-playing.c
@@ -583,9 +583,8 @@ static void _set_layout(Evas_Object * obj)
        }
 }
 
-static void _mp_now_left_area_clicked_cb(void *data, Evas_Object * o,
-                                                                                const char *emission,
-                                                                                const char *source)
+static void _mp_now_left_area_clicked_cb(void *data, Evas_Object * obj,
+                                                                                  void *event_info)
 {
        startfunc;
        DEBUG_TRACE("album clicked");
@@ -739,6 +738,7 @@ Evas_Object *mp_now_playing_create(Evas_Object * parent,
        elm_image_prescale_set(thumbnail, MP_NOW_PLAYING_THUMBNAIL_ICON_SIZE);
 
        elm_grid_pack(playing_pannel, thumbnail, MP_NOW_PLAYING_THUMBNAIL_SX, MP_NOW_PLAYING_THUMBNAIL_SY, MP_NOW_PLAYING_THUMBNAIL_ICON_SIZE, MP_NOW_PLAYING_THUMBNAIL_ICON_SIZE);
+
        evas_object_show(thumbnail);
 
        wd->thumbnail = thumbnail;
@@ -797,6 +797,7 @@ Evas_Object *mp_now_playing_create(Evas_Object * parent,
        evas_object_event_callback_add(playing_pannel, EVAS_CALLBACK_FREE,
                                                                   _widget_del_cb, wd);
 
+       evas_object_smart_callback_add(thumbnail, "clicked", _mp_now_left_area_clicked_cb, wd);
        //elm_object_signal_callback_add(playing_pannel, SIGNAL_NOW_PLAYING_CLICKED, "*", _mp_now_playing_control_cb, wd);
        //elm_object_signal_callback_add(playing_pannel, SIGNAL_PREVIOUS, "*", _mp_now_playing_control_cb, wd);
        //elm_object_signal_callback_add(playing_pannel, SIGNAL_NP_PLAY, "*", _mp_now_playing_control_cb, wd);