rvandegrift
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

have tasks always set inset and autoscroll so it works right. 

SVN revision: 65118
This commit is contained in:
Carsten Haitzler 2011-11-13 05:47:09 +00:00
parent 859f31e407
commit a3bfd5d8bb
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_gadcon.c
View File

@ -450,7 +450,8 @@ e_gadcon_populate(E_Gadcon *gc)
else if (gcc->o_base) else if (gcc->o_base)
e_gadcon_layout_pack_options_set(gcc->o_base, gcc); e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll); if (!gcc->autoscroll_set)
e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
// e_gadcon_client_resizable_set(gcc, cf_gcc->resizable); // e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
if (gcc->client_class->func.orient) if (gcc->client_class->func.orient)
gcc->client_class->func.orient(gcc, gc->orient); gcc->client_class->func.orient(gcc, gc->orient);
@ -523,7 +524,8 @@ e_gadcon_populate_class(E_Gadcon *gc, const E_Gadcon_Client_Class *cc)
else if (gcc->o_base) else if (gcc->o_base)
e_gadcon_layout_pack_options_set(gcc->o_base, gcc); e_gadcon_layout_pack_options_set(gcc->o_base, gcc);
e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll); if (!gcc->autoscroll_set)
e_gadcon_client_autoscroll_set(gcc, cf_gcc->autoscroll);
// e_gadcon_client_resizable_set(gcc, cf_gcc->resizable); // e_gadcon_client_resizable_set(gcc, cf_gcc->resizable);
if (gcc->client_class->func.orient) if (gcc->client_class->func.orient)
gcc->client_class->func.orient(gcc, gc->orient); gcc->client_class->func.orient(gcc, gc->orient);
@ -1171,6 +1173,7 @@ e_gadcon_client_autoscroll_set(E_Gadcon_Client *gcc, int autoscroll)
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
gcc->autoscroll = autoscroll; gcc->autoscroll = autoscroll;
gcc->autoscroll_set = 1;
/* /*
if (gcc->autoscroll) if (gcc->autoscroll)
{ {

2
src/bin/e_gadcon.h
View File

@ -195,9 +195,9 @@ struct _E_Gadcon_Client
const char *style; const char *style;
unsigned char autoscroll : 1; unsigned char autoscroll : 1;
unsigned char resizable : 1; unsigned char resizable : 1;
unsigned char moving : 1; unsigned char moving : 1;
unsigned char resizing : 1; unsigned char resizing : 1;
unsigned char autoscroll_set : 1;
Evas_Coord dx, dy; Evas_Coord dx, dy;
struct struct

11
src/modules/tasks/e_mod_main.c
View File

@ -124,6 +124,7 @@ e_modapi_init(E_Module *m)
Config_Item *config; Config_Item *config;
tasks_config = E_NEW(Config, 1); tasks_config = E_NEW(Config, 1);
config = E_NEW(Config_Item, 1); config = E_NEW(Config_Item, 1);
config->id = eina_stringshare_add("0"); config->id = eina_stringshare_add("0");
config->show_all = 0; config->show_all = 0;
@ -217,7 +218,7 @@ e_modapi_save(E_Module *m __UNUSED__)
/**************************************************************/ /**************************************************************/
static E_Gadcon_Client * static E_Gadcon_Client *
_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style __UNUSED__)
{ {
Tasks *tasks; Tasks *tasks;
Evas_Object *o; Evas_Object *o;
@ -228,7 +229,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
tasks = _tasks_new(gc->evas, gc->zone, id); tasks = _tasks_new(gc->evas, gc->zone, id);
o = tasks->o_items; o = tasks->o_items;
gcc = e_gadcon_client_new(gc, name, id, style, o); gcc = e_gadcon_client_new(gc, name, id, E_GADCON_CLIENT_STYLE_INSET, o);
gcc->data = tasks; gcc->data = tasks;
tasks->gcc = gcc; tasks->gcc = gcc;
@ -237,9 +238,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
tasks_config->tasks = eina_list_append(tasks_config->tasks, tasks); tasks_config->tasks = eina_list_append(tasks_config->tasks, tasks);
e_gadcon_client_autoscroll_set(gcc, 1);
// Fill on initial config // Fill on initial config
_tasks_config_updated(tasks->config); _tasks_config_updated(tasks->config);
return gcc; return gcc;
} }
@ -395,6 +396,8 @@ _tasks_refill(Tasks *tasks)
h * eina_list_count(tasks->items)); h * eina_list_count(tasks->items));
} }
} }
else
e_gadcon_client_min_size_set(tasks->gcc, 0, 0);
} }
static void static void
@ -621,6 +624,8 @@ _tasks_config_item_get(const char *id)
config = E_NEW(Config_Item, 1); config = E_NEW(Config_Item, 1);
config->id = eina_stringshare_add(id); config->id = eina_stringshare_add(id);
config->show_all = 0; config->show_all = 0;
config->minw = 100;
config->minh = 32;
tasks_config->items = eina_list_append(tasks_config->items, config); tasks_config->items = eina_list_append(tasks_config->items, config);