elementar / ctxpopup - not important changes but ready for refactoring.

SVN revision: 58956

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index e37d91f..43289f7 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -49,10 +49,16 @@ struct _Widget_Data
 
 static const char *widtype = NULL;
 
-static void _del_hook(Evas_Object *obj);
-static void _del_pre_hook(Evas_Object *obj);
-static void _theme_hook(Evas_Object *obj);
-static void _sizing_eval(Evas_Object *obj);
+static void _freeze_on(void *data __UNUSED__, Evas_Object *obj,
+                       void *event_info __UNUSED__);
+static void _freeze_off(void *data __UNUSED__, Evas_Object *obj,
+                        void *event_info __UNUSED__);
+static void _hold_on(void *data __UNUSED__, Evas_Object *obj,
+                     void *event_info __UNUSED__);
+static void _hold_off(void *data __UNUSED__, Evas_Object *obj,
+                      void *event_info __UNUSED__);
+static void _scroller_size_reset(Widget_Data *wd);
+static void _hover_parent_callbacks_del(Evas_Object *obj);
 static void _hover_parent_resize(void *data, Evas *e __UNUSED__,
                                  Evas_Object *obj __UNUSED__,
                                  void *event_info __UNUSED__);
@@ -62,7 +68,24 @@ static void _hover_parent_move(void *data, Evas *e __UNUSED__,
 static void _hover_parent_del(void *data, Evas *e __UNUSED__,
                               Evas_Object *obj __UNUSED__,
                               void *event_info __UNUSED__);
-static void _hover_parent_callbacks_del(Evas_Object *obj);
+static void _item_sizing_eval(Elm_Ctxpopup_Item *item);
+static void _adjust_pos_x(Evas_Coord_Point *pos, Evas_Coord_Point *base_size,
+                          Evas_Coord_Rectangle *hover_area);
+static void _adjust_pos_y(Evas_Coord_Point *pos, Evas_Coord_Point *base_size,
+                          Evas_Coord_Rectangle *hover_area);
+static void _ctxpopup_changed_size_hints(void *data __UNUSED__,
+                                         Evas *e __UNUSED__, Evas_Object *obj,
+                                         void *event_info __UNUSED__);
+static Elm_Ctxpopup_Direction _calc_base_geometry(Evas_Object *obj,
+                                                  Evas_Coord_Rectangle *rect);
+static void _update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir);
+static void _sizing_eval(Evas_Object *obj);
+static void _shift_base_by_arrow(Evas_Object *arrow,
+                                 Elm_Ctxpopup_Direction dir,
+                                 Evas_Coord_Rectangle *rect);
+static void _del_pre_hook(Evas_Object *obj);
+static void _del_hook(Evas_Object *obj);
+static void _theme_hook(Evas_Object *obj);
 static void _bg_clicked_cb(void *data, Evas_Object *obj __UNUSED__,
                            const char *emission __UNUSED__,
                            const char *source __UNUSED__);
@@ -70,45 +93,23 @@ static void _parent_resize(void *data, Evas *e, Evas_Object *obj,
                            void *event_info __UNUSED__);
 static void _ctxpopup_show(void *data __UNUSED__, Evas *e __UNUSED__,
                            Evas_Object *obj, void *event_info __UNUSED__);
+static void _hide(Evas_Object *obj);
 static void _ctxpopup_hide(void *data __UNUSED__, Evas *e __UNUSED__,
                            Evas_Object *obj, void *event_info __UNUSED__);
-static void _ctxpopup_move(void *data __UNUSED__, Evas *e __UNUSED__,
-                           Evas_Object *obj, void *event_info __UNUSED__);
 static void _scroller_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj,
                              void *event_info __UNUSED__);
-static void _ctxpopup_changed_size_hints(void *data __UNUSED__,
-                                         Evas *e __UNUSED__, Evas_Object *obj,
-                                         void *event_info __UNUSED__);
-static void _item_new(Elm_Ctxpopup_Item *item, char *group_name);
-static void _list_new(Evas_Object *obj);
-static void _item_sizing_eval(Elm_Ctxpopup_Item *item);
+static void _ctxpopup_move(void *data __UNUSED__, Evas *e __UNUSED__,
+                           Evas_Object *obj, void *event_info __UNUSED__);
 static void _item_select_cb(void *data, Evas_Object *obj __UNUSED__,
                             const char *emission __UNUSED__,
                             const char *source __UNUSED__);
-static Elm_Ctxpopup_Direction _calc_base_geometry(Evas_Object *obj,
-                                                  Evas_Coord_Rectangle *rect);
-static void _update_arrow(Evas_Object *obj, Elm_Ctxpopup_Direction dir);
-static void _shift_base_by_arrow(Evas_Object *arrow,
-                                 Elm_Ctxpopup_Direction dir,
-                                 Evas_Coord_Rectangle *rect);
-static void _adjust_pos_x(Evas_Coord_Point *pos, Evas_Coord_Point *base_size,
-                          Evas_Coord_Rectangle *hover_area);
-static void _adjust_pos_y(Evas_Coord_Point *pos, Evas_Coord_Point *base_size,
-                          Evas_Coord_Rectangle *hover_area);
-static void _scroller_size_reset(Widget_Data *wd);
-static void _hide(Evas_Object *obj);
-static void _content_del(void *data, Evas *e, Evas_Object *obj __UNUSED__,
-                         void *event_info __UNUSED__);
-static void _freeze_on(void *data __UNUSED__, Evas_Object *obj,
-                       void *event_info __UNUSED__);
-static void _freeze_off(void *data __UNUSED__, Evas_Object *obj,
-                        void *event_info __UNUSED__);
-static void _hold_on(void *data __UNUSED__, Evas_Object *obj,
-                     void *event_info __UNUSED__);
-static void _hold_off(void *data __UNUSED__, Evas_Object *obj,
-                      void *event_info __UNUSED__);
 static void _item_icon_set(Elm_Ctxpopup_Item *item, Evas_Object *icon);
 static void _item_label_set(Elm_Ctxpopup_Item *item, const char *label);
+static void _item_new(Elm_Ctxpopup_Item *item, char *group_name);
+static void _content_del(void *data, Evas *e, Evas_Object *obj __UNUSED__,
+                         void *event_info __UNUSED__);
+static void _list_del(Widget_Data *wd);
+static void _list_new(Evas_Object *obj);
 static void _remove_items(Widget_Data * wd);
 
 static const char SIG_DISMISSED[] = "dismissed";