Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_shelf_config.c
Log Message:
Fix for Shelf Size issues: After setting a size in Advanced mode, subsequent
returns to Basic mode did not allow a user to select a Basic Size.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_int_shelf_config.c 31 Aug 2006 04:16:43 -0000 1.20
+++ e_int_shelf_config.c 20 Sep 2006 01:01:52 -0000 1.21
@@ -25,6 +25,8 @@
E_Config_Shelf *escfg;
/* BASIC */
int mode;
+ int basic_size;
+
/* ADVANCED */
char *style;
int orient;
@@ -111,6 +113,17 @@
cfdata->fit_along = cfdata->escfg->fit_along;
cfdata->fit_size = cfdata->escfg->fit_size;
cfdata->size = cfdata->escfg->size;
+ if (cfdata->size <= 24)
+ cfdata->basic_size = 24;
+ else if (cfdata->size <= 32)
+ cfdata->basic_size = 32;
+ else if (cfdata->size <= 40)
+ cfdata->basic_size = 40;
+ else if (cfdata->size <= 48)
+ cfdata->basic_size = 48;
+ else if (cfdata->size >= 48)
+ cfdata->basic_size = 56;
+
if ((!cfdata->escfg->popup) &&
(cfdata->escfg->layer == 1))
cfdata->layering = 0;
@@ -202,8 +215,9 @@
break;
}
- cfdata->escfg->size = cfdata->size;
-
+ cfdata->escfg->size = cfdata->basic_size;
+ cfdata->size = cfdata->basic_size;
+
zone = cfdata->es->zone;
id = cfdata->es->id;
cfdata->es->config_dialog = NULL;
@@ -274,6 +288,17 @@
/* Only Change size if we need to */
if (cfdata->escfg->size != cfdata->size)
{
+ if (cfdata->size <= 24)
+ cfdata->basic_size = 24;
+ else if (cfdata->size <= 32)
+ cfdata->basic_size = 32;
+ else if (cfdata->size <= 40)
+ cfdata->basic_size = 40;
+ else if (cfdata->size <= 48)
+ cfdata->basic_size = 48;
+ else if (cfdata->size >= 48)
+ cfdata->basic_size = 56;
+
cfdata->escfg->size = cfdata->size;
cfdata->es->size = cfdata->size;
restart = 1;
@@ -369,9 +394,9 @@
ob = e_widget_radio_icon_add(evas, NULL, "enlightenment/shelf_custom", 64,
24, MODE_CUSTOM, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(ol, of, 1, 1, 0.5);
-
+
of = e_widget_framelist_add(evas, _("Size"), 0);
- rg = e_widget_radio_group_new(&(cfdata->size));
+ rg = e_widget_radio_group_new(&(cfdata->basic_size));
ob = e_widget_radio_add(evas, _("Tiny"), 24, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Small"), 32, rg);
-------------------------------------------------------------------------
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
