seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=1588e4503d9a3dc909c1385e596ee2a6c3725435
commit 1588e4503d9a3dc909c1385e596ee2a6c3725435
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date: Fri Nov 15 22:32:56 2013 +0900
elm_index.c: changed internal smart data variable name more descriptive.
- event -> event_rect
- and added a comment for that variable.
---
src/lib/elm_index.c | 36 ++++++++++++++++++------------------
src/lib/elm_widget_index.h | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 7dd9041..a61242f 100644
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -352,7 +352,7 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
if (!int_ret) return;
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
- evas_object_size_hint_min_set(sd->event[0], minw, minh);
+ evas_object_size_hint_min_set(sd->event_rect[0], minw, minh);
if (edje_object_part_exists
(wd->resize_obj, "elm.swallow.index.1"))
@@ -374,20 +374,20 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
if (edje_object_part_exists
(wd->resize_obj, "elm.swallow.event.1"))
{
- if (!sd->event[1])
+ if (!sd->event_rect[1])
{
- sd->event[1] =
+ sd->event_rect[1] =
evas_object_rectangle_add(evas_object_evas_get(obj));
- evas_object_color_set(sd->event[1], 0, 0, 0, 0);
- elm_widget_sub_object_add(obj, sd->event[1]);
+ evas_object_color_set(sd->event_rect[1], 0, 0, 0, 0);
+ elm_widget_sub_object_add(obj, sd->event_rect[1]);
}
- elm_layout_content_set(obj, "elm.swallow.event.1", sd->event[1]);
- evas_object_size_hint_min_set(sd->event[1], minw, minh);
+ elm_layout_content_set(obj, "elm.swallow.event.1", sd->event_rect[1]);
+ evas_object_size_hint_min_set(sd->event_rect[1], minw, minh);
}
- else if (sd->event[1])
+ else if (sd->event_rect[1])
{
- evas_object_del(sd->event[1]);
- sd->event[1] = NULL;
+ evas_object_del(sd->event_rect[1]);
+ sd->event_rect[1] = NULL;
}
edje_object_message_signal_process(wd->resize_obj);
@@ -914,7 +914,7 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
evas_object_event_callback_add
(obj, EVAS_CALLBACK_RESIZE, _index_resize_cb, NULL);
- priv->event[0] = o = evas_object_rectangle_add(evas_object_evas_get(obj));
+ priv->event_rect[0] = o =
evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_color_set(o, 0, 0, 0, 0);
elm_coords_finger_size_adjust(1, &minw, 1, &minh);
evas_object_size_hint_min_set(o, minw, minh);
@@ -944,7 +944,7 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list
EINA_UNUSED)
(wd->resize_obj, "elm.swallow.event.1"))
{
o = evas_object_rectangle_add(evas_object_evas_get(obj));
- priv->event[1] = o;
+ priv->event_rect[1] = o;
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_size_hint_min_set(o, minw, minh);
elm_layout_content_set(obj, "elm.swallow.event.1", o);
@@ -1071,11 +1071,11 @@ _access_obj_process(Evas_Object *obj, Eina_Bool
is_access)
_access_index_register(obj);
evas_object_event_callback_add
- (sd->event[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access, obj);
+ (sd->event_rect[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access,
obj);
evas_object_event_callback_add
- (sd->event[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access, obj);
+ (sd->event_rect[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access,
obj);
evas_object_event_callback_add
- (sd->event[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access, obj);
+ (sd->event_rect[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access,
obj);
}
else
{
@@ -1085,11 +1085,11 @@ _access_obj_process(Evas_Object *obj, Eina_Bool
is_access)
(obj, elm_layout_edje_get(obj), "access");
evas_object_event_callback_del_full
- (sd->event[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access, obj);
+ (sd->event_rect[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access,
obj);
evas_object_event_callback_del_full
- (sd->event[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access, obj);
+ (sd->event_rect[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access,
obj);
evas_object_event_callback_del_full
- (sd->event[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access, obj);
+ (sd->event_rect[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access,
obj);
}
}
diff --git a/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h
index eca4fb2..288a610 100644
--- a/src/lib/elm_widget_index.h
+++ b/src/lib/elm_widget_index.h
@@ -20,7 +20,7 @@
typedef struct _Elm_Index_Smart_Data Elm_Index_Smart_Data;
struct _Elm_Index_Smart_Data
{
- Evas_Object *event[2];
+ Evas_Object *event_rect[2]; /*<< rectangle objects for event
handling */
Evas_Object *bx[2]; // 2 - for now all that's supported
Eina_List *items; /* 1 list. N levels, but only 2
* for now and # of items will be
--
