[Panel] added content_size_set to make panel visible 62/77162/2 accepted/tizen/common/20160703.130143 accepted/tizen/ivi/20160630.003839 accepted/tizen/mobile/20160630.003813 accepted/tizen/tv/20160630.003730 accepted/tizen/wearable/20160630.003858 submit/tizen/20160629.094813
authorSung-Taek Hong <sth253.hong@samsung.com>
Wed, 28 Jan 2015 12:37:34 +0000 (21:37 +0900)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Wed, 29 Jun 2016 05:02:26 +0000 (22:02 -0700)
Set the content_size value to make the panel come out.
Cherrypick Tizen Only feature from Tizen_2.4.

Change-Id: Ib9b3215889a86267f5e00ca9190798ad84755355
Signed-off-by: Sung-Taek Hong <sth253.hong@samsung.com>
src/lib/elm_panel.c
src/lib/elm_panel.eo

index 5f369346734ce47b480c6a5cd118c11a179c4fcb..a117b9448ad3c022fa0a493012a3edbae25f8fed 100644 (file)
@@ -1075,6 +1075,18 @@ _elm_panel_evas_object_smart_del(Eo *obj, Elm_Panel_Data *sd)
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
 }
 
+// TIZEN_ONLY(20150128): Panel implementation merge into 2.4
+EOLIAN static void
+_elm_panel_elm_widget_orientation_set(Eo *obj, Elm_Panel_Data *sd EINA_UNUSED, int orient_mode)
+{
+   eo_do_super(obj, MY_CLASS, elm_obj_widget_orientation_set(orient_mode));
+   if (orient_mode == 90 || orient_mode == 270)
+     elm_panel_scrollable_content_size_set(obj, 0.45);
+   else
+     elm_panel_scrollable_content_size_set(obj, 0.80);
+}
+////////////////////////////////////////////////////////////
+
 EOLIAN static void
 _elm_panel_evas_object_smart_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x, Evas_Coord y)
 {
@@ -1421,6 +1433,13 @@ _elm_panel_scrollable_set(Eo *obj, Elm_Panel_Data *sd, Eina_Bool scrollable)
 
         elm_widget_resize_object_set(obj, sd->scr_edje, EINA_TRUE);
 
+        // TIZEN_ONLY(20150128): Panel implementation merge into 2.4
+        if (elm_win_rotation_get(elm_widget_top_get(obj)) == 90 || elm_win_rotation_get(elm_widget_top_get(obj)) == 270)
+          elm_panel_scrollable_content_size_set(obj, 0.45);
+        else
+          elm_panel_scrollable_content_size_set(obj, 0.80);
+        ////////////////////////////////////////////////////////////
+
         if (!sd->hit_rect)
           {
              sd->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
index 667834c7a950fc4fa9619ae9fe175f358a7c083e..d6e4aa25093106b043a86cfd9b0bf823242db10d 100644 (file)
@@ -83,6 +83,9 @@ class Elm.Panel (Elm.Layout, Elm_Interface_Scrollable,
       Elm.Container.content_unset;
       Elm.Container.content_set;
       Elm.Layout.sizing_eval;
+      // TIZEN_ONLY(20150128): Panel implementation merge into 2.4
+      Elm.Widget.orientation.set;
+      ////////////////////////////////////////////////////////////
       Elm_Interface_Atspi_Widget_Action.elm_actions.get;
    }
 }