Revert "ctxpopup: fix 'more' style problem. remove white space, fix landscape and...

This reverts commit 7c35cdd837100ff1762e1482201b7a92e224d7dc.

Signed-off-by: JinYong Park <j4939.park@samsung.com>
Change-Id: If3d6c64811676655bbaab1ecbf25ba313070aa64

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 198a401..9b0acb3 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -10,9 +10,6 @@
 #include <Elementary.h>
 
 #include "elm_priv.h"
-//TIZEN_ONLY(20160412): fix 'more' style size problem
-#include "elm_interface_scrollable.h"
-//
 #include "elm_widget_ctxpopup.h"
 
 #define MY_CLASS ELM_CTXPOPUP_CLASS
@@ -208,11 +205,6 @@ _base_geometry_calc(Evas_Object *obj,
    Evas_Coord_Point max_size;
    Evas_Coord_Point min_size;
    Evas_Coord_Point temp;
-   //TIZEN_ONLY(20160412): fix 'more' style size problem
-   Evas_Coord maxh = 0;
-   Evas_Coord scrh = 0;
-   const char *str = NULL;
-   //
    int idx;
 
    ELM_CTXPOPUP_DATA_GET(obj, sd);
@@ -241,43 +233,14 @@ _base_geometry_calc(Evas_Object *obj,
    //Limit to Max Size
    evas_object_size_hint_max_get(obj, &max_size.x, &max_size.y);
 
-   //TIZEN_ONLY(20160412): fix 'more' style size problem
-   if (sd->list && sd->list_visible)
-     {
-        eo_do(sd->list, elm_interface_scrollable_content_size_get(NULL, &scrh));
-        if (base_size.y < scrh)
-          base_size.y = scrh;
-     }
-   //
-
    if ((max_size.y > 0) && (base_size.y > max_size.y))
      base_size.y = max_size.y;
 
    if ((max_size.x > 0) && (base_size.x > max_size.x))
      base_size.x = max_size.x;
-
-   //TIZEN_ONLY(20160412): fix 'more' style size problem
-   if ((wd->orient_mode == 90) || (wd->orient_mode == 270))
-     str = edje_object_data_get(elm_layout_edje_get(obj), "visible_landscape_maxh");
-
-   if (!str) str = edje_object_data_get(elm_layout_edje_get(obj), "visible_maxh");
-
-   if (str) maxh = (int)(atoi(str)
-                         * elm_config_scale_get() * elm_object_scale_get(obj)
-                         / edje_object_base_scale_get(elm_layout_edje_get(obj)));
-
-   if ((maxh > 0) && (base_size.y > maxh))
-     base_size.y = maxh;
-   //
-
    //Limit to Min Size
    evas_object_size_hint_min_get(obj, &min_size.x, &min_size.y);
 
-   //TIZEN_ONLY(20160412): fix 'more' style size problem
-   if ((min_size.y > 0) && (min_size.y > maxh))
-     min_size.y = maxh;
-   //
-
    if ((min_size.y > 0) && (base_size.y < min_size.y))
      base_size.y = min_size.y;
 
@@ -1104,10 +1067,6 @@ _on_show(void *data EINA_UNUSED,
         sd->emitted = EINA_FALSE;
         /* END */
 
-        //TIZEN_ONLY(20160412): fix 'more' style size problem
-        elm_layout_sizing_eval(obj);
-        //
-
         return;
      }