summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-10-21 21:00:07 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2011-10-21 21:00:07 +0000
commit72700795f20c851562263e30405b1f0e6f05443d (patch)
tree012c824dc61c50356f26cf6e2fba34f6ac2eff09 /legacy
parent4b911014e59fb381978ad9076260bfa39dd5675b (diff)
more reordering
SVN revision: 64268
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/src/lib/elm_gen.c16
-rw-r--r--legacy/elementary/src/lib/elm_gen.h8
-rw-r--r--legacy/elementary/src/lib/elm_gengrid.c19
-rw-r--r--legacy/elementary/src/lib/elm_genlist.c19
4 files changed, 31 insertions, 31 deletions
diff --git a/legacy/elementary/src/lib/elm_gen.c b/legacy/elementary/src/lib/elm_gen.c
index 18a6274d74..c93449aae1 100644
--- a/legacy/elementary/src/lib/elm_gen.c
+++ b/legacy/elementary/src/lib/elm_gen.c
@@ -6,13 +6,18 @@
6struct _Widget_Data 6struct _Widget_Data
7{ 7{
8 Eina_Inlist_Sorted_State *state; 8 Eina_Inlist_Sorted_State *state;
9 Evas_Object *obj; 9 Evas_Object *obj;
10 Eina_List *selected; 10 Evas_Object *scr; /* a smart scroller object which is used internally in genlist */
11 Eina_List *group_items; 11 Evas_Object *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */
12 Eina_List *selected;
13 Eina_List *group_items;
12 Eina_Inlist *items; /* inlist of all items */ 14 Eina_Inlist *items; /* inlist of all items */
13 Elm_Gen_Item *reorder_it; /* item currently being repositioned */ 15 Elm_Gen_Item *reorder_it; /* item currently being repositioned */
16 Elm_Gen_Item *last_selected_item;
17 Pan *pan; /* pan_smart object's smart data */
14 Ecore_Job *calc_job; 18 Ecore_Job *calc_job;
15 int walking; 19 int walking;
20 Evas_Coord pan_x, pan_y;
16 Eina_Bool reorder_mode : 1; 21 Eina_Bool reorder_mode : 1;
17 Eina_Bool on_hold : 1; 22 Eina_Bool on_hold : 1;
18 Eina_Bool multi : 1; 23 Eina_Bool multi : 1;
@@ -221,7 +226,7 @@ _item_single_select_right(Widget_Data *wd)
221 return EINA_TRUE; 226 return EINA_TRUE;
222} 227}
223#endif 228#endif
224 229/******************************************************************************/
225void 230void
226elm_gen_item_unrealize(Elm_Gen_Item *it, 231elm_gen_item_unrealize(Elm_Gen_Item *it,
227 Eina_Bool calc, 232 Eina_Bool calc,
@@ -314,3 +319,4 @@ elm_gen_item_new(Widget_Data *wd,
314 elm_widget_item_text_get_hook_set(it, _item_label_hook); 319 elm_widget_item_text_get_hook_set(it, _item_label_hook);
315 return it; 320 return it;
316} 321}
322/******************************************************************************/
diff --git a/legacy/elementary/src/lib/elm_gen.h b/legacy/elementary/src/lib/elm_gen.h
index b16113b96a..3c7cbbf8b9 100644
--- a/legacy/elementary/src/lib/elm_gen.h
+++ b/legacy/elementary/src/lib/elm_gen.h
@@ -5,6 +5,7 @@
5typedef struct Elm_Gen_Item_Type Elm_Gen_Item_Type; 5typedef struct Elm_Gen_Item_Type Elm_Gen_Item_Type;
6typedef struct Elm_Gen_Item_Tooltip Elm_Gen_Item_Tooltip; 6typedef struct Elm_Gen_Item_Tooltip Elm_Gen_Item_Tooltip;
7typedef struct _Widget_Data Widget_Data; 7typedef struct _Widget_Data Widget_Data;
8typedef struct _Pan Pan;
8 9
9struct Elm_Gen_Item_Tooltip 10struct Elm_Gen_Item_Tooltip
10{ 11{
@@ -15,6 +16,13 @@ struct Elm_Gen_Item_Tooltip
15 Eina_Bool free_size : 1; 16 Eina_Bool free_size : 1;
16}; 17};
17 18
19struct _Pan
20{
21 Evas_Object_Smart_Clipped_Data __clipped_data;
22 Widget_Data *wd;
23 Ecore_Job *resize_job;
24};
25
18struct Elm_Gen_Item 26struct Elm_Gen_Item
19{ 27{
20 ELM_WIDGET_ITEM; 28 ELM_WIDGET_ITEM;
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 3cea21efc6..1ad1954569 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -9,8 +9,6 @@
9 * Handle non-homogeneous objects too. 9 * Handle non-homogeneous objects too.
10 */ 10 */
11 11
12 typedef struct _Pan Pan;
13
14#define PRELOAD 1 12#define PRELOAD 1
15#define REORDER_EFFECT_TIME 0.5 13#define REORDER_EFFECT_TIME 0.5
16 14
@@ -30,12 +28,17 @@ struct _Widget_Data
30{ 28{
31 Eina_Inlist_Sorted_State *state; 29 Eina_Inlist_Sorted_State *state;
32 Evas_Object *obj; /* the gengrid object */ 30 Evas_Object *obj; /* the gengrid object */
31 Evas_Object *scr; /* a smart scroller object which is used internally in genlist */
32 Evas_Object *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */
33 Eina_List *selected; 33 Eina_List *selected;
34 Eina_List *group_items; /* list of groups index items */ 34 Eina_List *group_items; /* list of groups index items */
35 Eina_Inlist *items; /* inlist of all items */ 35 Eina_Inlist *items; /* inlist of all items */
36 Elm_Gen_Item *reorder_it; /* item currently being repositioned */ 36 Elm_Gen_Item *reorder_it; /* item currently being repositioned */
37 Elm_Gen_Item *last_selected_item;
38 Pan *pan; /* pan_smart object's smart data */
37 Ecore_Job *calc_job; 39 Ecore_Job *calc_job;
38 int walking; 40 int walking;
41 Evas_Coord pan_x, pan_y;
39 Eina_Bool reorder_mode : 1; 42 Eina_Bool reorder_mode : 1;
40 Eina_Bool on_hold : 1; 43 Eina_Bool on_hold : 1;
41 Eina_Bool multi : 1; 44 Eina_Bool multi : 1;
@@ -43,13 +46,9 @@ struct _Widget_Data
43 Eina_Bool wasselected : 1; 46 Eina_Bool wasselected : 1;
44 Eina_Bool always_select : 1; 47 Eina_Bool always_select : 1;
45 //////////////////////////////////// 48 ////////////////////////////////////
46 Evas_Object *scr;
47 Evas_Object *pan_smart;
48 Pan *pan;
49 Elm_Gen_Item *last_selected_item;
50 double align_x, align_y; 49 double align_x, align_y;
51 50
52 Evas_Coord pan_x, pan_y, old_pan_x, old_pan_y; 51 Evas_Coord old_pan_x, old_pan_y;
53 Evas_Coord item_width, item_height; /* Each it size */ 52 Evas_Coord item_width, item_height; /* Each it size */
54 Evas_Coord group_item_width, group_item_height; /* Each group it size */ 53 Evas_Coord group_item_width, group_item_height; /* Each group it size */
55 Evas_Coord minw, minh; /* Total obj size */ 54 Evas_Coord minw, minh; /* Total obj size */
@@ -70,12 +69,6 @@ struct _Widget_Data
70#define ELM_GENGRID_ITEM_FROM_INLIST(it) \ 69#define ELM_GENGRID_ITEM_FROM_INLIST(it) \
71 ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL) 70 ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL)
72 71
73struct _Pan
74{
75 Evas_Object_Smart_Clipped_Data __clipped_data;
76 Widget_Data *wd;
77};
78
79static const char *widtype = NULL; 72static const char *widtype = NULL;
80static void _item_highlight(Elm_Gen_Item *it); 73static void _item_highlight(Elm_Gen_Item *it);
81static void _item_unrealize_cb(Elm_Gen_Item *it); 74static void _item_unrealize_cb(Elm_Gen_Item *it);
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index d92f8a37e9..928ed3ae8b 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -11,7 +11,6 @@
11#define REORDER_EFFECT_TIME 0.5 11#define REORDER_EFFECT_TIME 0.5
12 12
13typedef struct _Item_Block Item_Block; 13typedef struct _Item_Block Item_Block;
14typedef struct _Pan Pan;
15typedef struct _Item_Cache Item_Cache; 14typedef struct _Item_Cache Item_Cache;
16 15
17struct Elm_Gen_Item_Type 16struct Elm_Gen_Item_Type
@@ -49,12 +48,17 @@ struct _Widget_Data
49{ 48{
50 Eina_Inlist_Sorted_State *state; 49 Eina_Inlist_Sorted_State *state;
51 Evas_Object *obj; /* the genlist object */ 50 Evas_Object *obj; /* the genlist object */
51 Evas_Object *scr; /* a smart scroller object which is used internally in genlist */
52 Evas_Object *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */
52 Eina_List *selected; 53 Eina_List *selected;
53 Eina_List *group_items; /* list of groups index items */ 54 Eina_List *group_items; /* list of groups index items */
54 Eina_Inlist *items; /* inlist of all items */ 55 Eina_Inlist *items; /* inlist of all items */
55 Elm_Gen_Item *reorder_it; /* item currently being repositioned */ 56 Elm_Gen_Item *reorder_it; /* item currently being repositioned */
57 Elm_Gen_Item *last_selected_item;
58 Pan *pan; /* pan_smart object's smart data */
56 Ecore_Job *calc_job; 59 Ecore_Job *calc_job;
57 int walking; 60 int walking;
61 Evas_Coord pan_x, pan_y;
58 Eina_Bool reorder_mode : 1; 62 Eina_Bool reorder_mode : 1;
59 Eina_Bool on_hold : 1; 63 Eina_Bool on_hold : 1;
60 Eina_Bool multi : 1; 64 Eina_Bool multi : 1;
@@ -62,17 +66,13 @@ struct _Widget_Data
62 Eina_Bool wasselected : 1; 66 Eina_Bool wasselected : 1;
63 Eina_Bool always_select : 1; 67 Eina_Bool always_select : 1;
64 //////////////////////////////////// 68 ////////////////////////////////////
65 Evas_Object *scr; /* a smart scroller object which is used internally in genlist */
66 Evas_Object *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */
67 Eina_Inlist *blocks; /* inlist of all blocks. a block consists of a certain number of items. maximum number of items in a block is 'max_items_per_block'. */ 69 Eina_Inlist *blocks; /* inlist of all blocks. a block consists of a certain number of items. maximum number of items in a block is 'max_items_per_block'. */
68 Pan *pan; /* pan_smart object's smart data */ 70 Evas_Coord reorder_old_pan_y, w, h, minw, minh, realminw, prev_viewport_w;
69 Evas_Coord pan_x, pan_y, reorder_old_pan_y, w, h, minw, minh, realminw, prev_viewport_w;
70 Ecore_Job *update_job; 71 Ecore_Job *update_job;
71 Ecore_Idle_Enterer *queue_idle_enterer; 72 Ecore_Idle_Enterer *queue_idle_enterer;
72 Ecore_Idler *must_recalc_idler; 73 Ecore_Idler *must_recalc_idler;
73 Eina_List *queue; 74 Eina_List *queue;
74 Elm_Gen_Item *show_item, *anchor_item, *mode_item, *reorder_rel, *expanded_item; 75 Elm_Gen_Item *show_item, *anchor_item, *mode_item, *reorder_rel, *expanded_item;
75 Elm_Gen_Item *last_selected_item; /* the last selected it. */
76 Eina_Inlist *item_cache; /* an inlist of edje object it cache. */ 76 Eina_Inlist *item_cache; /* an inlist of edje object it cache. */
77 Evas_Coord anchor_y; 77 Evas_Coord anchor_y;
78 Evas_Coord reorder_start_y; /* reorder it's initial y coordinate in the pan. */ 78 Evas_Coord reorder_start_y; /* reorder it's initial y coordinate in the pan. */
@@ -149,13 +149,6 @@ struct _Item_Cache
149#define ELM_GENLIST_ITEM_FROM_INLIST(it) \ 149#define ELM_GENLIST_ITEM_FROM_INLIST(it) \
150 ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL) 150 ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL)
151 151
152struct _Pan
153{
154 Evas_Object_Smart_Clipped_Data __clipped_data;
155 Widget_Data *wd;
156 Ecore_Job *resize_job;
157};
158
159static const char *widtype = NULL; 152static const char *widtype = NULL;
160static void _item_cache_zero(Widget_Data *wd); 153static void _item_cache_zero(Widget_Data *wd);
161static void _del_hook(Evas_Object *obj); 154static void _del_hook(Evas_Object *obj);