forked from enlightenment/enlightenment
fix bug where changing config in one clock gadget would reset all clock gadgets
SVN revision: 79229
This commit is contained in:
parent
0906b365d1
commit
c2ef62e4b5
|
@ -161,7 +161,9 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__,
|
||||||
|
|
||||||
ci = cfd->data;
|
ci = cfd->data;
|
||||||
memcpy(ci, &(cfdata->cfg), sizeof(Config_Item));
|
memcpy(ci, &(cfdata->cfg), sizeof(Config_Item));
|
||||||
e_int_clock_instances_redo();
|
ci->changed = EINA_TRUE;
|
||||||
|
e_int_clock_instances_redo(EINA_FALSE);
|
||||||
|
ci->changed = EINA_FALSE;
|
||||||
e_config_save_queue();
|
e_config_save_queue();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -459,7 +459,7 @@ _eval_instance_size(Instance *inst)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
e_int_clock_instances_redo(void)
|
e_int_clock_instances_redo(Eina_Bool all)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Instance *inst;
|
Instance *inst;
|
||||||
|
@ -469,6 +469,7 @@ e_int_clock_instances_redo(void)
|
||||||
{
|
{
|
||||||
Evas_Object *o = inst->o_clock;
|
Evas_Object *o = inst->o_clock;
|
||||||
|
|
||||||
|
if ((!all) && (!inst->cfg->changed)) continue;
|
||||||
_todaystr_eval(inst, todaystr, sizeof(todaystr) - 1);
|
_todaystr_eval(inst, todaystr, sizeof(todaystr) - 1);
|
||||||
if (inst->cfg->digital_clock)
|
if (inst->cfg->digital_clock)
|
||||||
e_theme_edje_object_set(o, "base/theme/modules/clock",
|
e_theme_edje_object_set(o, "base/theme/modules/clock",
|
||||||
|
@ -529,7 +530,7 @@ _update_today_timer(void *data __UNUSED__)
|
||||||
const struct tm *now;
|
const struct tm *now;
|
||||||
struct tm today;
|
struct tm today;
|
||||||
|
|
||||||
e_int_clock_instances_redo();
|
e_int_clock_instances_redo(EINA_TRUE);
|
||||||
if (!clock_instances)
|
if (!clock_instances)
|
||||||
{
|
{
|
||||||
update_today = NULL;
|
update_today = NULL;
|
||||||
|
@ -793,7 +794,7 @@ _e_mod_action_cb_mouse(E_Object *obj __UNUSED__, const char *params, Ecore_Event
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
_clock_eio_update(void *d __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
|
_clock_eio_update(void *d __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
|
||||||
{
|
{
|
||||||
e_int_clock_instances_redo();
|
e_int_clock_instances_redo(EINA_TRUE);
|
||||||
return ECORE_CALLBACK_RENEW;
|
return ECORE_CALLBACK_RENEW;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -811,7 +812,7 @@ _clock_fd_update(void *d __UNUSED__, Ecore_Fd_Handler *fdh)
|
||||||
char buf[64];
|
char buf[64];
|
||||||
|
|
||||||
read(ecore_main_fd_handler_fd_get(fdh), buf, sizeof(buf));
|
read(ecore_main_fd_handler_fd_get(fdh), buf, sizeof(buf));
|
||||||
e_int_clock_instances_redo();
|
e_int_clock_instances_redo(EINA_TRUE);
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,10 +31,11 @@ struct _Config_Item
|
||||||
int digital_24h;
|
int digital_24h;
|
||||||
int show_seconds;
|
int show_seconds;
|
||||||
int show_date;
|
int show_date;
|
||||||
|
Eina_Bool changed;
|
||||||
};
|
};
|
||||||
|
|
||||||
void e_int_config_clock_module(E_Container *con, Config_Item *ci);
|
void e_int_config_clock_module(E_Container *con, Config_Item *ci);
|
||||||
void e_int_clock_instances_redo(void);
|
void e_int_clock_instances_redo(Eina_Bool all);
|
||||||
|
|
||||||
extern Config *clock_config;
|
extern Config *clock_config;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue