Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibar
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Move the manipulation of user specified policy flags (ALLOW_OVERLAP and
ALWAYS_ON_TOP (not used yet)) to the gadman edit menu, saves a LOT of code
inside modules
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_config.c 13 Feb 2006 15:45:12 -0000 1.17
+++ e_mod_config.c 12 Mar 2006 16:12:57 -0000 1.18
@@ -10,7 +10,6 @@
int autofit;
int follower;
int iconsize;
- int allow_overlap;
double follow_speed;
double autoscroll_speed;
};
@@ -56,7 +55,6 @@
cfdata->autofit = (ib->conf->width == IBAR_WIDTH_AUTO);
cfdata->follower = ib->conf->follower;
cfdata->iconsize = ib->conf->iconsize;
- cfdata->allow_overlap = ib->conf->allow_overlap;
cfdata->follow_speed = ib->conf->follow_speed;
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
}
@@ -94,7 +92,6 @@
ob = e_widget_check_add(evas, _("Auto Fit Icons"), &(cfdata->autofit));
e_widget_list_object_append(o, ob, 1, 1, 0.5);
- ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"),
&(cfdata->allow_overlap));
e_widget_list_object_append(o, ob, 1, 1, 0.5);
return o;
}
@@ -115,11 +112,6 @@
ib->conf->follower = 0;
}
- if (cfdata->allow_overlap && !ib->conf->allow_overlap)
- ib->conf->allow_overlap = 1;
- else if (!cfdata->allow_overlap && ib->conf->allow_overlap)
- ib->conf->allow_overlap = 0;
-
if ((cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_FIXED))
{
ib->conf->width = IBAR_WIDTH_AUTO;
@@ -167,7 +159,6 @@
/* allow overlap checkbox */
of = e_widget_framelist_add(evas, _("Extras"), 0);
- ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"),
&(cfdata->allow_overlap));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
@@ -189,12 +180,6 @@
ib->conf->follower = 0;
}
- /* allow overlap check box */
- if (cfdata->allow_overlap && !ib->conf->allow_overlap)
- ib->conf->allow_overlap = 1;
- else if (!cfdata->allow_overlap && ib->conf->allow_overlap)
- ib->conf->allow_overlap = 0;
-
if ((cfdata->autofit) && (ib->conf->width == IBAR_WIDTH_FIXED))
{
ib->conf->width = IBAR_WIDTH_AUTO;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- e_mod_main.c 20 Feb 2006 19:10:25 -0000 1.108
+++ e_mod_main.c 12 Mar 2006 16:12:57 -0000 1.109
@@ -222,7 +222,6 @@
E_CONFIG_VAL(D, T, autoscroll_speed, DOUBLE);
E_CONFIG_VAL(D, T, iconsize, INT);
E_CONFIG_VAL(D, T, width, INT);
- E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_LIST(D, T, bars, conf_bar_edd);
ib->conf = e_config_domain_load("module.ibar", conf_edd);
@@ -234,14 +233,12 @@
ib->conf->follow_speed = 0.9;
ib->conf->autoscroll_speed = 0.95;
ib->conf->iconsize = 24;
- ib->conf->allow_overlap = 0;
ib->conf->width = IBAR_WIDTH_AUTO;
}
E_CONFIG_LIMIT(ib->conf->follow_speed, 0.01, 1.0);
E_CONFIG_LIMIT(ib->conf->autoscroll_speed, 0.01, 1.0);
E_CONFIG_LIMIT(ib->conf->iconsize, 2, 400);
E_CONFIG_LIMIT(ib->conf->width, -2, -1);
- E_CONFIG_LIMIT(ib->conf->allow_overlap, 0, 1);
_ibar_config_menu_new(ib);
@@ -587,11 +584,6 @@
if (ibb->ibar->conf->width == IBAR_WIDTH_FIXED)
policy |= E_GADMAN_POLICY_HSIZE;
- if (ibb->ibar->conf->allow_overlap == 0)
- policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
- else
- policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
-
e_gadman_client_policy_set(ibb->gmc, policy);
e_gadman_client_min_size_set(ibb->gmc, 8, 8);
e_gadman_client_max_size_set(ibb->gmc, 3200, 3200);
@@ -1019,11 +1011,6 @@
e_box_align_set(ibb->box_object, 0.5, 0.5);
policy = E_GADMAN_POLICY_EDGES | E_GADMAN_POLICY_HMOVE |
E_GADMAN_POLICY_VMOVE;
- if (ibb->ibar->conf->allow_overlap == 0)
- policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
- else
- policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
-
if ((edge == E_GADMAN_EDGE_BOTTOM) ||
(edge == E_GADMAN_EDGE_TOP))
{
@@ -1068,11 +1055,6 @@
policy = E_GADMAN_POLICY_EDGES | E_GADMAN_POLICY_HMOVE |
E_GADMAN_POLICY_VMOVE;
- if (ibb->ibar->conf->allow_overlap == 0)
- policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
- else
- policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
-
if ((e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_BOTTOM) ||
(e_gadman_client_edge_get(ibb->gmc) == E_GADMAN_EDGE_TOP))
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_main.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_mod_main.h 11 Mar 2006 16:14:56 -0000 1.30
+++ e_mod_main.h 12 Mar 2006 16:12:57 -0000 1.31
@@ -21,7 +21,6 @@
double autoscroll_speed;
int iconsize;
int width;
- int allow_overlap;
Evas_List *bars;
};
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
