Enlightenment CVS committal
Author : urandom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_config.h e_int_config_shelf.c
e_int_shelf_config.c e_maximize.c e_shelf.c
Log Message:
added an option for the shelf to let itself be overlapped by maximized windows
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- e_config.c 22 Sep 2006 19:55:11 -0000 1.205
+++ e_config.c 1 Oct 2006 20:10:37 -0000 1.206
@@ -120,6 +120,7 @@
E_CONFIG_VAL(D, T, fit_size, UCHAR);
E_CONFIG_VAL(D, T, style, STR);
E_CONFIG_VAL(D, T, size, INT);
+ E_CONFIG_VAL(D, T, overlap, INT);
_e_config_desktop_bg_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Background",
E_Config_Desktop_Background);
#undef T
@@ -1112,7 +1113,7 @@
{
E_Config_Shelf *cf_es;
-#define CFG_SHELF(_name, _con, _zone, _pop, _lay, _orient, _fita, _fits,
_style, _size) \
+#define CFG_SHELF(_name, _con, _zone, _pop, _lay, _orient, _fita, _fits,
_style, _size, _overlap) \
cf_es = E_NEW(E_Config_Shelf, 1); \
cf_es->name = evas_stringshare_add(_name); \
cf_es->container = _con; \
@@ -1124,30 +1125,31 @@
cf_es->fit_size = _fits; \
cf_es->style = evas_stringshare_add(_style); \
cf_es->size = _size; \
+ cf_es->overlap = _overlap; \
e_config->shelves = evas_list_append(e_config->shelves, cf_es)
/* shelves for 4 zones on head 0 by default */
CFG_SHELF("shelf", 0, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
- 1, 0, "default", 40);
+ 1, 0, "default", 40, 0);
CFG_SHELF("shelf", 0, 1,
1, 200, E_GADCON_ORIENT_BOTTOM,
- 1, 0, "default", 40);
+ 1, 0, "default", 40, 0);
CFG_SHELF("shelf", 0, 2,
1, 200, E_GADCON_ORIENT_BOTTOM,
- 1, 0, "default", 40);
+ 1, 0, "default", 40, 0);
CFG_SHELF("shelf", 0, 3,
1, 200, E_GADCON_ORIENT_BOTTOM,
- 1, 0, "default", 40);
+ 1, 0, "default", 40, 0);
/* shelves for heada 1, 2, and 3 by default */
CFG_SHELF("shelf", 1, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
- 1, 0, "default", 40);
+ 1, 0, "default", 40, 0);
CFG_SHELF("shelf", 2, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
- 1, 0, "default", 40);
+ 1, 0, "default", 40, 0);
CFG_SHELF("shelf", 3, 0,
1, 200, E_GADCON_ORIENT_BOTTOM,
- 1, 0, "default", 40);
+ 1, 0, "default", 40, 0);
}
{
E_Config_Gadcon *cf_gc;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- e_config.h 21 Sep 2006 19:53:37 -0000 1.122
+++ e_config.h 1 Oct 2006 20:10:37 -0000 1.123
@@ -360,6 +360,7 @@
unsigned char fit_size;
const char *style;
int size;
+ int overlap;
};
struct _E_Config_Mime_Icon
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_shelf.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_int_config_shelf.c 14 Aug 2006 15:22:45 -0000 1.23
+++ e_int_config_shelf.c 1 Oct 2006 20:10:37 -0000 1.24
@@ -216,6 +216,7 @@
cfg->fit_size = 0;
cfg->style = evas_stringshare_add("default");
cfg->size = 40;
+ cfg->overlap = 0;
e_config->shelves = evas_list_append(e_config->shelves, cfg);
e_config_save_queue();
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_int_shelf_config.c 20 Sep 2006 01:01:52 -0000 1.21
+++ e_int_shelf_config.c 1 Oct 2006 20:10:37 -0000 1.22
@@ -34,6 +34,7 @@
int fit_size;
int size;
int layering;
+ int overlapping;
};
/* a nice easy setup function that does the dirty work */
@@ -113,6 +114,7 @@
cfdata->fit_along = cfdata->escfg->fit_along;
cfdata->fit_size = cfdata->escfg->fit_size;
cfdata->size = cfdata->escfg->size;
+ cfdata->overlapping = cfdata->escfg->overlap;
if (cfdata->size <= 24)
cfdata->basic_size = 24;
else if (cfdata->size <= 32)
@@ -332,6 +334,8 @@
}
}
+ cfdata->escfg->overlap = cfdata->overlapping;
+
if (restart)
{
zone = cfdata->es->zone;
@@ -439,6 +443,8 @@
ob = e_widget_radio_add(evas, _("Below Windows"), 1, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Below Everything"), 0, rg);
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, _("Allow windows to overlap the shelf"),
&(cfdata->overlapping));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_maximize.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_maximize.c 23 Sep 2006 08:46:07 -0000 1.18
+++ e_maximize.c 1 Oct 2006 20:10:37 -0000 1.19
@@ -135,6 +135,7 @@
E_Shelf *es;
es = l->data;
+ if (es->cfg->overlap) continue;
if (es->zone != bd->zone) continue;
OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
es->x + es->zone->x + es->w, es->y + es->zone->y + es->h);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_shelf.c 18 Sep 2006 03:49:44 -0000 1.40
+++ e_shelf.c 1 Oct 2006 20:10:37 -0000 1.41
@@ -314,6 +314,7 @@
cf_es->style = evas_stringshare_add(es->style);
cf_es->fit_along = es->fit_along;
cf_es->fit_size = es->fit_size;
+ cf_es->overlap = 0;
es->cfg = cf_es;
}
e_config_save_queue();
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
