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

pager/desks - stop using numeric N,M if no name is set - be blank

This commit is contained in:
Carsten Haitzler 2019-09-19 18:33:17 +01:00
parent 1783c32839
commit 11c0fb01bd
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -150,7 +150,6 @@ TODO:
* pager: add "Set desktop name" on right click on desktop in pager * pager: add "Set desktop name" on right click on desktop in pager
* turn on desktop names when setting one here * turn on desktop names when setting one here
* pager: add "Set wallpaper" on right clikc on desktop in pager * pager: add "Set wallpaper" on right clikc on desktop in pager
* pager: only show desktop names set and not 0,0 0,1 etc.
* start: start menu could do with more featured content * start: start menu could do with more featured content
* like you see on windows for example (search and multiple columns etc.) * like you see on windows for example (search and multiple columns etc.)
* a touch screen android-style scrolling fullscreen app icon style * a touch screen android-style scrolling fullscreen app icon style
@ -186,7 +185,7 @@ TODO:
screen migrated to has diffrent res screen migrated to has diffrent res
* randr: when losing a zone/screen, put windows in purgatory and then have * randr: when losing a zone/screen, put windows in purgatory and then have
purgatory screens available via pager to drag onto a current screen, purgatory screens available via pager to drag onto a current screen,
or the specific virtual desktops from purgator to be accessible evenm or the specific virtual desktops from purgator to be accessible even
if not on a real screen/zone if not on a real screen/zone
* device manager: new tool to browser /sys etc. and display nicely present * device manager: new tool to browser /sys etc. and display nicely present
hardware and device drivers and state hardware and device drivers and state

12
src/bin/e_desk.c
View File

@ -118,11 +118,7 @@ e_desk_new(E_Zone *zone, int x, int y)
break; break;
} }
if (!ok) if (!ok) desk->name = eina_stringshare_add("");
{
snprintf(name, sizeof(name), "%d,%d", x, y);
desk->name = eina_stringshare_add(name);
}
/* Get window profile name for current desktop */ /* Get window profile name for current desktop */
if (zone->randr2_id) if (zone->randr2_id)
@ -231,11 +227,7 @@ e_desk_name_update(void)
break; break;
} }
if (!ok) if (!ok) e_desk_name_set(desk, "");
{
snprintf(name, sizeof(name), "%d,%d", d_x, d_y);
e_desk_name_set(desk, name);
}
} }
} }
} }

12
src/modules/conf_display/e_int_config_desk.c
View File

@ -55,7 +55,6 @@ static void
_fill_data(E_Config_Dialog_Data *cfdata) _fill_data(E_Config_Dialog_Data *cfdata)
{ {
Eina_List *l; Eina_List *l;
char name[1024];
int ok = 0; int ok = 0;
cfdata->bg = e_bg_file_get(cfdata->zone_num, cfdata->desk_x, cfdata->desk_y); cfdata->bg = e_bg_file_get(cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
@ -75,11 +74,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
ok = 1; ok = 1;
break; break;
} }
if (!ok) if (!ok) cfdata->name = strdup("");
{
snprintf(name, sizeof(name), "%d,%d", cfdata->desk_x, cfdata->desk_y);
cfdata->name = strdup(name);
}
} }
static void * static void *
@ -106,13 +101,10 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
static int static int
_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
{ {
char name[40];
if ((!cfdata->name) || (!cfdata->name[0])) if ((!cfdata->name) || (!cfdata->name[0]))
{ {
snprintf(name, sizeof(name), "%d,%d", cfdata->desk_x, cfdata->desk_y);
free(cfdata->name); free(cfdata->name);
cfdata->name = strdup(name); cfdata->name = strdup("");
} }
e_desk_name_del(cfdata->zone_num, e_desk_name_del(cfdata->zone_num,