From: discomfitor Date: Fri, 21 Oct 2011 21:04:06 +0000 (+0000) Subject: even more reordering, also convert some evas coords to int X-Git-Tag: REL_F_I9500_20120323_1~17^2~1541 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a34bd5d417856cb6f1d3c8dc2126c56b1021399;p=framework%2Fuifw%2Felementary.git even more reordering, also convert some evas coords to int git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64269 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/elm_gen.c b/src/lib/elm_gen.c index c93449a..b47358b 100644 --- a/src/lib/elm_gen.c +++ b/src/lib/elm_gen.c @@ -17,6 +17,8 @@ struct _Widget_Data Pan *pan; /* pan_smart object's smart data */ Ecore_Job *calc_job; int walking; + int item_width, item_height; + int group_item_width, group_item_height; Evas_Coord pan_x, pan_y; Eina_Bool reorder_mode : 1; Eina_Bool on_hold : 1; diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 1ad1954..7dc6b85 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -38,6 +38,8 @@ struct _Widget_Data Pan *pan; /* pan_smart object's smart data */ Ecore_Job *calc_job; int walking; + int item_width, item_height; + int group_item_width, group_item_height; Evas_Coord pan_x, pan_y; Eina_Bool reorder_mode : 1; Eina_Bool on_hold : 1; @@ -49,8 +51,6 @@ struct _Widget_Data double align_x, align_y; Evas_Coord old_pan_x, old_pan_y; - Evas_Coord item_width, item_height; /* Each it size */ - Evas_Coord group_item_width, group_item_height; /* Each group it size */ Evas_Coord minw, minh; /* Total obj size */ Evas_Coord reorder_item_x, reorder_item_y; unsigned int nmax; diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 928ed3a..942250c 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -58,6 +58,8 @@ struct _Widget_Data Pan *pan; /* pan_smart object's smart data */ Ecore_Job *calc_job; int walking; + int item_width, item_height; + int group_item_width, group_item_height; Evas_Coord pan_x, pan_y; Eina_Bool reorder_mode : 1; Eina_Bool on_hold : 1; @@ -106,10 +108,6 @@ struct _Widget_Data int item_cache_count; int item_cache_max; /* maximum number of cached items */ int movements; - int item_width; - int item_height; - int group_item_width; - int group_item_height; int max_items_per_block; /* maximum number of items per block */ double longpress_timeout; /* longpress timeout. this value comes from _elm_config by default. this can be changed by elm_genlist_longpress_timeout_set() */ };