jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tiling2: Get rid of the use_rows config.

This commit is contained in:
Tom Hacohen 2014-01-16 13:03:50 +00:00
parent b092052297
commit 5cec6d14cb
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/tiling/e_mod_config.c
View File

@ -70,7 +70,6 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
newvd->y = vd->y; newvd->y = vd->y;
newvd->zone_num = vd->zone_num; newvd->zone_num = vd->zone_num;
newvd->nb_stacks = vd->nb_stacks; newvd->nb_stacks = vd->nb_stacks;
newvd->use_rows = vd->use_rows;
EINA_LIST_APPEND(cfdata->config.vdesks, newvd); EINA_LIST_APPEND(cfdata->config.vdesks, newvd);
} }
@ -237,13 +236,12 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__,
continue; continue;
} }
if (newvd->nb_stacks != vd->nb_stacks if (newvd->nb_stacks != vd->nb_stacks) {
|| newvd->use_rows != vd->use_rows) { DBG("number of columns for (%d, %d, %d) changed from %d"
DBG("number of columns for (%d, %d, %d) changed from %d|%d" " to %d",
" to %d|%d",
vd->x, vd->y, vd->zone_num, vd->x, vd->y, vd->zone_num,
vd->nb_stacks, vd->use_rows, vd->nb_stacks,
newvd->nb_stacks, newvd->use_rows); newvd->nb_stacks);
change_desk_conf(newvd); change_desk_conf(newvd);
free(vd); free(vd);
l->data = NULL; l->data = NULL;
@ -279,7 +277,6 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__,
newvd->y = vd->y; newvd->y = vd->y;
newvd->zone_num = vd->zone_num; newvd->zone_num = vd->zone_num;
newvd->nb_stacks = vd->nb_stacks; newvd->nb_stacks = vd->nb_stacks;
newvd->use_rows = vd->use_rows;
EINA_LIST_APPEND(tiling_g.config->vdesks, newvd); EINA_LIST_APPEND(tiling_g.config->vdesks, newvd);
} }

7
src/modules/tiling/e_mod_tiling.c
View File

@ -407,11 +407,6 @@ change_desk_conf(struct _Config_vdesk *newconf)
check_tinfo(d); check_tinfo(d);
if (_G.tinfo->conf) { if (_G.tinfo->conf) {
old_nb_stacks = _G.tinfo->conf->nb_stacks; old_nb_stacks = _G.tinfo->conf->nb_stacks;
if (_G.tinfo->conf->use_rows != newconf->use_rows) {
_G.tinfo->conf = newconf;
_G.tinfo->conf->use_rows = !_G.tinfo->conf->use_rows;
return;
}
} else { } else {
newconf->nb_stacks = 0; newconf->nb_stacks = 0;
} }
@ -1031,7 +1026,6 @@ e_modapi_init(E_Module *m)
E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, y, INT); E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, y, INT);
E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, zone_num, INT); E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, zone_num, INT);
E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, nb_stacks, INT); E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, nb_stacks, INT);
E_CONFIG_VAL(_G.vdesk_edd, struct _Config_vdesk, use_rows, INT);
tiling_g.config = e_config_domain_load("module.tiling", _G.config_edd); tiling_g.config = e_config_domain_load("module.tiling", _G.config_edd);
if (!tiling_g.config) { if (!tiling_g.config) {
@ -1049,7 +1043,6 @@ e_modapi_init(E_Module *m)
vd = l->data; vd = l->data;
E_CONFIG_LIMIT(vd->nb_stacks, 0, TILING_MAX_STACKS); E_CONFIG_LIMIT(vd->nb_stacks, 0, TILING_MAX_STACKS);
E_CONFIG_LIMIT(vd->use_rows, 0, 1);
} }
desk = get_current_desk(); desk = get_current_desk();

1
src/modules/tiling/e_mod_tiling.h
View File

@ -32,7 +32,6 @@ struct _Config_vdesk
int x, y; int x, y;
unsigned int zone_num; unsigned int zone_num;
int nb_stacks; int nb_stacks;
int use_rows;
}; };
struct _Config struct _Config