Minor formatting fixes.

SVN revision: 32518
This commit is contained in:
Christopher Michael 2007-11-09 07:43:38 +00:00
parent 9765562c92
commit 90163254fd
1 changed files with 56 additions and 47 deletions

View File

@ -3,7 +3,7 @@
*/
#ifdef E_TYPEDEFS
#define E_GADCON_CLIENT(x) ((E_Gadcon_Client *)(x))
#define E_GADCON_CLIENT(x) ((E_Gadcon_Client *)(x))
/* different layout policies - only 1 supported for now */
typedef enum _E_Gadcon_Layout_Policy
@ -54,10 +54,11 @@ struct _E_Gadcon
E_Gadcon_Layout_Policy layout_policy;
struct {
Evas_Object *o_parent;
const char *swallow_name;
} edje;
struct
{
Evas_Object *o_parent;
const char *swallow_name;
} edje;
Ecore_Evas *ecore_evas;
E_Zone *zone;
@ -67,18 +68,21 @@ struct _E_Gadcon
Evas_Object *o_container;
Evas_List *clients;
struct {
void (*func) (void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
void *data;
} resize_request, min_size_request;
struct {
Evas_Object *(*func) (void *data, E_Gadcon_Client *gcc, const char *style);
void *data;
} frame_request;
struct {
void (*func) (void *data, E_Menu *menu);
void *data;
} menu_attach;
struct
{
void (*func) (void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
void *data;
} resize_request, min_size_request;
struct
{
Evas_Object *(*func) (void *data, E_Gadcon_Client *gcc, const char *style);
void *data;
} frame_request;
struct
{
void (*func) (void *data, E_Menu *menu);
void *data;
} menu_attach;
E_Config_Dialog *config_dialog;
unsigned char editing : 1;
@ -97,19 +101,20 @@ struct _E_Gadcon_Client_Class
int version;
/* All members below are part of version 1 */
char *name;
struct {
E_Gadcon_Client *(*init) (E_Gadcon *gc, const char *name, const char *id, const char *style);
void (*shutdown) (E_Gadcon_Client *gcc);
void (*orient) (E_Gadcon_Client *gcc);
char *(*label) (void);
Evas_Object *(*icon) (Evas *evas);
/* All members below are part of version 2 */
/* Create new id, so that the gadcon client can refer to a config set inside the module */
const char *(*id_new) (void);
/* Del an id when a gadcon client is removed from the system */
void (*id_del) (const char *id);
/* All members below are part of version 3 */
} func;
struct
{
E_Gadcon_Client *(*init) (E_Gadcon *gc, const char *name, const char *id, const char *style);
void (*shutdown) (E_Gadcon_Client *gcc);
void (*orient) (E_Gadcon_Client *gcc);
char *(*label) (void);
Evas_Object *(*icon) (Evas *evas);
/* All members below are part of version 2 */
/* Create new id, so that the gadcon client can refer to a config set inside the module */
const char *(*id_new) (void);
/* Del an id when a gadcon client is removed from the system */
void (*id_del) (const char *id);
/* All members below are part of version 3 */
} func;
char *default_style;
};
@ -126,28 +131,32 @@ struct _E_Gadcon_Client
Evas_Object *o_event;
const E_Gadcon_Client_Class *client_class;
void *data;
struct {
int pos, size, res;
} config;
struct
{
int pos, size, res;
} config;
struct {
int seq, flags; /* goes to save */
int state, resist;
int prev_pos, prev_size;
int want_save : 1;
} state_info;
struct
{
int seq, flags; /* goes to save */
int state, resist;
int prev_pos, prev_size;
int want_save : 1;
} state_info;
struct {
Evas_Coord w, h;
} pad, min, aspect;
struct
{
Evas_Coord w, h;
} pad, min, aspect;
Ecore_Timer *scroll_timer;
Ecore_Animator *scroll_animator;
double scroll_pos;
double scroll_wanted;
struct {
struct
{
void *data;
void (*func) (void *data);
} scroll_cb;
} scroll_cb;
E_Menu *menu;
const char *style;
@ -158,9 +167,10 @@ struct _E_Gadcon_Client
unsigned char resizing : 1;
Evas_Coord dx, dy;
struct {
struct
{
int x, y;
} drag;
} drag;
unsigned char hidden : 1;
@ -212,7 +222,6 @@ EAPI void e_gadcon_client_autoscroll_update(E_Gadcon_Client *gcc, in
EAPI void e_gadcon_client_autoscroll_cb_set(E_Gadcon_Client *gcc, void (*func)(void *data), void *data);
EAPI void e_gadcon_client_resizable_set(E_Gadcon_Client *gcc, int resizable);
EAPI int e_gadcon_client_geometry_get(E_Gadcon_Client *gcc, int *x, int *y, int *w, int *h);
EAPI void e_gadcon_client_util_menu_items_append(E_Gadcon_Client *gcc, E_Menu *menu, int flags);
EAPI void e_gadcon_client_util_menu_attach(E_Gadcon_Client *gcc);