elm gen/gengrid/genlist: More clean ups.

SVN revision: 65724
This commit is contained in:
Daniel Juyung Seo 2011-11-30 17:42:26 +00:00
parent 35fc57e252
commit 3fd427b0d3
4 changed files with 8 additions and 41 deletions

View File

@ -5,38 +5,6 @@
#include "elm_gen.h"
#include "elm_genlist.h"
struct _Widget_Data
{
Eina_Inlist_Sorted_State *state;
Evas_Object *obj;
Evas_Object *scr; /* a smart scroller object which is used internally in genlist */
Evas_Object *pan_smart; /* "elm_genlist_pan" evas smart object. this is an extern pan of smart scroller(scr). */
Eina_List *selected;
Eina_List *group_items;
Eina_Inlist *items; /* inlist of all items */
Elm_Gen_Item *reorder_it; /* item currently being repositioned */
Elm_Gen_Item *last_selected_item;
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;
int minw, minh;
long count;
Evas_Coord pan_x, pan_y;
Eina_Bool reorder_mode : 1;
Eina_Bool on_hold : 1;
Eina_Bool multi : 1;
Eina_Bool no_select : 1;
Eina_Bool wasselected : 1;
Eina_Bool always_select : 1;
Eina_Bool clear_me : 1;
Eina_Bool h_bounce : 1;
Eina_Bool v_bounce : 1;
Ecore_Cb del_cb, calc_cb, sizing_cb;
Ecore_Cb clear_cb;
};
EAPI void
elm_gen_clear(Evas_Object *obj)
{

View File

@ -8,7 +8,6 @@
typedef struct Elm_Gen_Item_Type Elm_Gen_Item_Type;
typedef struct Elm_Gen_Item_Tooltip Elm_Gen_Item_Tooltip;
typedef struct _Widget_Data Widget_Data;
typedef struct _Pan Pan;
struct Elm_Gen_Item_Tooltip
{
@ -19,13 +18,6 @@ struct Elm_Gen_Item_Tooltip
Eina_Bool free_size : 1;
};
struct _Pan
{
Evas_Object_Smart_Clipped_Data __clipped_data;
Widget_Data *wd;
Ecore_Job *resize_job;
};
struct Elm_Gen_Item
{
ELM_WIDGET_ITEM;

View File

@ -16,7 +16,6 @@
(wd)->clear_cb = (Ecore_Cb)_clear_cb; \
(wd)->sizing_cb = (Ecore_Cb)_sizing_eval
#define ELM_GEN_ITEM_SETUP(it) \
(it)->del_cb = (Ecore_Cb)_item_del; \
(it)->highlight_cb = (Ecore_Cb)_item_highlight; \

View File

@ -2,6 +2,14 @@
#include <Elementary_Cursor.h>
#include "elm_priv.h"
typedef struct _Pan Pan;
struct _Pan
{
Evas_Object_Smart_Clipped_Data __clipped_data;
Widget_Data *wd;
Ecore_Job *resize_job;
};
Elm_Gen_Item *
_elm_genlist_item_new(Widget_Data *wd,
const Elm_Gen_Item_Class *itc,