enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Fix missing corner case for layout placement. 

Change variable name in policy settings.



SVN revision: 45099
This commit is contained in:
Christopher Michael 2010-01-14 00:20:32 +00:00
parent 09db1a4b46
commit 8fc8d8d24f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/illume2/e_mod_policy_settings.c
View File

@ -9,7 +9,7 @@ static void _il_config_policy_settings_changed(void *data, Evas_Object *obj, voi
static int _il_config_policy_settings_change_timeout(void *data); static int _il_config_policy_settings_change_timeout(void *data);
/* local variables */ /* local variables */
Ecore_Timer *_ps_change_timer = NULL; Ecore_Timer *_policy_change_timer = NULL;
Evas_Object *otop, *oleft; Evas_Object *otop, *oleft;
void void
@ -42,7 +42,8 @@ _il_config_policy_settings_create(E_Config_Dialog *cfd)
static void static void
_il_config_policy_settings_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) _il_config_policy_settings_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{ {
if (_ps_change_timer) ecore_timer_del(_ps_change_timer); if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
_policy_change_timer = NULL;
} }
static Evas_Object * static Evas_Object *
@ -88,8 +89,8 @@ _il_config_policy_settings_changed(void *data, Evas_Object *obj, void *event)
e_widget_disabled_set(otop, !il_cfg->policy.mode.dual); e_widget_disabled_set(otop, !il_cfg->policy.mode.dual);
e_widget_disabled_set(oleft, !il_cfg->policy.mode.dual); e_widget_disabled_set(oleft, !il_cfg->policy.mode.dual);
if (_ps_change_timer) ecore_timer_del(_ps_change_timer); if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
_ps_change_timer = _policy_change_timer =
ecore_timer_add(0.5, _il_config_policy_settings_change_timeout, data); ecore_timer_add(0.5, _il_config_policy_settings_change_timeout, data);
} }
@ -100,7 +101,7 @@ _il_config_policy_settings_change_timeout(void *data)
Ecore_X_Illume_Mode mode; Ecore_X_Illume_Mode mode;
e_config_save_queue(); e_config_save_queue();
_ps_change_timer = NULL; _policy_change_timer = NULL;
if (il_cfg->policy.mode.dual) if (il_cfg->policy.mode.dual)
{ {

7
src/modules/illume2/policies/illume/layout.c
View File

@ -95,14 +95,12 @@ _layout_zone_layout(E_Zone *zone)
Eina_List *l; Eina_List *l;
E_Border *bd; E_Border *bd;
// printf("Layout Zone: %d\n", zone->id);
cfg_zone = e_illume_zone_config_get(zone->id); cfg_zone = e_illume_zone_config_get(zone->id);
EINA_LIST_FOREACH(e_border_client_list(), l, bd) EINA_LIST_FOREACH(e_border_client_list(), l, bd)
{ {
int mh; int mh;
if ((bd->zone != zone) || (bd->new_client) || (!bd->visible)) continue; if ((bd->zone != zone) || (bd->new_client) || (!bd->visible)) continue;
// printf("\tBorder: %s\n", bd->client.icccm.name);
if (e_illume_border_is_top_shelf(bd)) if (e_illume_border_is_top_shelf(bd))
{ {
e_illume_border_min_get(bd, NULL, &mh); e_illume_border_min_get(bd, NULL, &mh);
@ -449,6 +447,11 @@ _zone_layout_dual_top_custom(E_Border *bd)
bh = ah; bh = ah;
by = ay; by = ay;
} }
else
{
bh = zh;
by = zy;
}
} }
} }
else if (bb) else if (bb)