summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-11-15 22:32:56 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-11-15 22:32:58 +0900
commit1588e4503d9a3dc909c1385e596ee2a6c3725435 (patch)
tree48791aa4a009177b2ec50c104b1ba1807cace7a1 /src
parent15295a5ee4630dba9ccd900e563adfb44fdd0d23 (diff)
elm_index.c: changed internal smart data variable name more descriptive.
- event -> event_rect - and added a comment for that variable.
Diffstat (limited to 'src')
-rw-r--r--src/lib/elm_index.c36
-rw-r--r--src/lib/elm_widget_index.h2
2 files changed, 19 insertions, 19 deletions
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 7dd904106..a61242fdc 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)
352 if (!int_ret) return; 352 if (!int_ret) return;
353 353
354 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 354 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
355 evas_object_size_hint_min_set(sd->event[0], minw, minh); 355 evas_object_size_hint_min_set(sd->event_rect[0], minw, minh);
356 356
357 if (edje_object_part_exists 357 if (edje_object_part_exists
358 (wd->resize_obj, "elm.swallow.index.1")) 358 (wd->resize_obj, "elm.swallow.index.1"))
@@ -374,20 +374,20 @@ _elm_index_smart_theme(Eo *obj, void *_pd, va_list *list)
374 if (edje_object_part_exists 374 if (edje_object_part_exists
375 (wd->resize_obj, "elm.swallow.event.1")) 375 (wd->resize_obj, "elm.swallow.event.1"))
376 { 376 {
377 if (!sd->event[1]) 377 if (!sd->event_rect[1])
378 { 378 {
379 sd->event[1] = 379 sd->event_rect[1] =
380 evas_object_rectangle_add(evas_object_evas_get(obj)); 380 evas_object_rectangle_add(evas_object_evas_get(obj));
381 evas_object_color_set(sd->event[1], 0, 0, 0, 0); 381 evas_object_color_set(sd->event_rect[1], 0, 0, 0, 0);
382 elm_widget_sub_object_add(obj, sd->event[1]); 382 elm_widget_sub_object_add(obj, sd->event_rect[1]);
383 } 383 }
384 elm_layout_content_set(obj, "elm.swallow.event.1", sd->event[1]); 384 elm_layout_content_set(obj, "elm.swallow.event.1", sd->event_rect[1]);
385 evas_object_size_hint_min_set(sd->event[1], minw, minh); 385 evas_object_size_hint_min_set(sd->event_rect[1], minw, minh);
386 } 386 }
387 else if (sd->event[1]) 387 else if (sd->event_rect[1])
388 { 388 {
389 evas_object_del(sd->event[1]); 389 evas_object_del(sd->event_rect[1]);
390 sd->event[1] = NULL; 390 sd->event_rect[1] = NULL;
391 } 391 }
392 edje_object_message_signal_process(wd->resize_obj); 392 edje_object_message_signal_process(wd->resize_obj);
393 393
@@ -914,7 +914,7 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
914 evas_object_event_callback_add 914 evas_object_event_callback_add
915 (obj, EVAS_CALLBACK_RESIZE, _index_resize_cb, NULL); 915 (obj, EVAS_CALLBACK_RESIZE, _index_resize_cb, NULL);
916 916
917 priv->event[0] = o = evas_object_rectangle_add(evas_object_evas_get(obj)); 917 priv->event_rect[0] = o = evas_object_rectangle_add(evas_object_evas_get(obj));
918 evas_object_color_set(o, 0, 0, 0, 0); 918 evas_object_color_set(o, 0, 0, 0, 0);
919 elm_coords_finger_size_adjust(1, &minw, 1, &minh); 919 elm_coords_finger_size_adjust(1, &minw, 1, &minh);
920 evas_object_size_hint_min_set(o, minw, minh); 920 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)
944 (wd->resize_obj, "elm.swallow.event.1")) 944 (wd->resize_obj, "elm.swallow.event.1"))
945 { 945 {
946 o = evas_object_rectangle_add(evas_object_evas_get(obj)); 946 o = evas_object_rectangle_add(evas_object_evas_get(obj));
947 priv->event[1] = o; 947 priv->event_rect[1] = o;
948 evas_object_color_set(o, 0, 0, 0, 0); 948 evas_object_color_set(o, 0, 0, 0, 0);
949 evas_object_size_hint_min_set(o, minw, minh); 949 evas_object_size_hint_min_set(o, minw, minh);
950 elm_layout_content_set(obj, "elm.swallow.event.1", o); 950 elm_layout_content_set(obj, "elm.swallow.event.1", o);
@@ -1071,11 +1071,11 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
1071 _access_index_register(obj); 1071 _access_index_register(obj);
1072 1072
1073 evas_object_event_callback_add 1073 evas_object_event_callback_add
1074 (sd->event[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access, obj); 1074 (sd->event_rect[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access, obj);
1075 evas_object_event_callback_add 1075 evas_object_event_callback_add
1076 (sd->event[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access, obj); 1076 (sd->event_rect[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access, obj);
1077 evas_object_event_callback_add 1077 evas_object_event_callback_add
1078 (sd->event[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access, obj); 1078 (sd->event_rect[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access, obj);
1079 } 1079 }
1080 else 1080 else
1081 { 1081 {
@@ -1085,11 +1085,11 @@ _access_obj_process(Evas_Object *obj, Eina_Bool is_access)
1085 (obj, elm_layout_edje_get(obj), "access"); 1085 (obj, elm_layout_edje_get(obj), "access");
1086 1086
1087 evas_object_event_callback_del_full 1087 evas_object_event_callback_del_full
1088 (sd->event[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access, obj); 1088 (sd->event_rect[0], EVAS_CALLBACK_MOUSE_IN, _on_mouse_in_access, obj);
1089 evas_object_event_callback_del_full 1089 evas_object_event_callback_del_full
1090 (sd->event[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access, obj); 1090 (sd->event_rect[0], EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_access, obj);
1091 evas_object_event_callback_del_full 1091 evas_object_event_callback_del_full
1092 (sd->event[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access, obj); 1092 (sd->event_rect[0], EVAS_CALLBACK_MOUSE_OUT, _on_mouse_out_access, obj);
1093 } 1093 }
1094} 1094}
1095 1095
diff --git a/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h
index eca4fb20e..288a610d1 100644
--- a/src/lib/elm_widget_index.h
+++ b/src/lib/elm_widget_index.h
@@ -20,7 +20,7 @@
20typedef struct _Elm_Index_Smart_Data Elm_Index_Smart_Data; 20typedef struct _Elm_Index_Smart_Data Elm_Index_Smart_Data;
21struct _Elm_Index_Smart_Data 21struct _Elm_Index_Smart_Data
22{ 22{
23 Evas_Object *event[2]; 23 Evas_Object *event_rect[2]; /*<< rectangle objects for event handling */
24 Evas_Object *bx[2]; // 2 - for now all that's supported 24 Evas_Object *bx[2]; // 2 - for now all that's supported
25 Eina_List *items; /* 1 list. N levels, but only 2 25 Eina_List *items; /* 1 list. N levels, but only 2
26 * for now and # of items will be 26 * for now and # of items will be