[elm_ctxpopu.c] changed scroller name .

[elm_slidingdrawer.c] nothing changed.

diff --git a/src/lib/elm_ctxpopup.c b/src/lib/elm_ctxpopup.c
index b9303ca..0a8af8c 100644 (file)
--- a/src/lib/elm_ctxpopup.c
+++ b/src/lib/elm_ctxpopup.c
@@ -253,6 +253,7 @@ _get_indicator_h(Evas_Object *parent)
    if(elm_win_indicator_state_get(parent) != 1) {
           return 0;
    }
+
    root = ecore_x_window_root_get(ecore_x_window_focus_get());
    ret  = ecore_x_window_prop_property_get(root, ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE,
                                                 ECORE_X_ATOM_CARDINAL, 32, &prop_data, &count);
@@ -622,6 +623,8 @@ _theme_hook(Evas_Object *obj)
    _elm_theme_object_set(obj, wd->arrow, "ctxpopup", "arrow",
                         elm_widget_style_get(obj));
 
+   elm_object_style_set(wd->scroller, elm_widget_style_get(obj));
+
    _sizing_eval(obj);
 
 }
@@ -855,7 +858,7 @@ elm_ctxpopup_add(Evas_Object *parent)
 
    //Scroller
    wd->scroller = elm_scroller_add(obj);
-   elm_object_style_set(wd->scroller, "ctxpopup_vbar");
+   elm_object_style_set(wd->scroller, "vertical");
    elm_scroller_content_min_limit(wd->scroller, EINA_TRUE, EINA_TRUE);
    elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_OFF,
                           ELM_SCROLLER_POLICY_ON);
@@ -946,7 +949,7 @@ elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
    wd->horizontal = horizontal;
    if (!horizontal)
      {
-       elm_object_style_set(wd->scroller, "ctxpopup_vbar");
+       elm_object_style_set(wd->scroller, "vertical");
        elm_box_horizontal_set(wd->box, EINA_FALSE);
        elm_scroller_bounce_set(wd->scroller, EINA_FALSE, EINA_TRUE);
        elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_ON,
@@ -956,7 +959,7 @@ elm_ctxpopup_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
      }
    else
      {
-       elm_object_style_set(wd->scroller, "ctxpopup_hbar");
+       elm_object_style_set(wd->scroller, "horizontal");
        elm_box_horizontal_set(wd->box, EINA_TRUE);
        elm_scroller_bounce_set(wd->scroller, EINA_TRUE, EINA_FALSE);
        elm_scroller_policy_set(wd->scroller, ELM_SCROLLER_POLICY_ON,

diff --git a/src/lib/elm_slidingdrawer.c b/src/lib/elm_slidingdrawer.c
index 890c789..ad52e0d 100644 (file)
--- a/src/lib/elm_slidingdrawer.c
+++ b/src/lib/elm_slidingdrawer.c
@@ -150,45 +150,17 @@ elm_slidingdrawer_add(Evas_Object *parent)
        Evas *e;\r
        Widget_Data *wd;\r
 \r
-       if(!parent)\r
-               return  NULL;\r
-\r
        wd = ELM_NEW(Widget_Data);\r
        if(!wd) return NULL;\r
 \r
        ELM_SET_WIDTYPE(widtype, "slidingdrawer");\r
 \r
-       wd->parent = parent;\r
        wd->max_drag_w = 1;\r
        wd->max_drag_h = 1;\r
 \r
+       wd->parent = parent;\r
        e = evas_object_evas_get(parent);\r
 \r
-       //window\r
-       /*\r
-       wd->win = elm_win_add(parent, "slidingdrawer", ELM_WIN_BASIC);\r
-       elm_win_autodel_set(wd->win, EINA_TRUE);\r
-       elm_win_borderless_set(wd->win, EINA_TRUE);\r
-       elm_win_alpha_set(wd->win, EINA_TRUE);\r
-       e = evas_object_evas_get(wd->win);\r
-\r
-       //widget\r
-       obj = elm_widget_add(e);\r
-       elm_widget_type_set(obj, "slidingdrawer");\r
-       elm_widget_sub_object_add(wd->win, obj);\r
-       elm_widget_data_set(obj, wd);\r
-       elm_widget_del_hook_set(obj, _del_hook);\r
-       elm_widget_theme_hook_set(obj, _theme_hook);\r
-       elm_win_resize_object_add(wd->win, obj);\r
-\r
-       //base\r
-       wd->base = edje_object_add(e);\r
-       _elm_theme_object_set(wd->win, wd->base, "slidingdrawer", "base", "default");\r
-       elm_widget_sub_object_add(obj, wd->base);\r
-       evas_object_show(wd->base);\r
-       elm_widget_resize_object_set(obj, wd->base);\r
-       */\r
-\r
        //widget\r
        obj = elm_widget_add(e);\r
        elm_widget_type_set(obj, "slidingdrawer");\r