Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/ibox
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/ibox/e_mod_config.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_config.c 29 Jan 2006 02:36:24 -0000 1.17
+++ e_mod_config.c 12 Mar 2006 16:12:58 -0000 1.18
@@ -12,7 +12,6 @@
int iconsize;
double follow_speed;
double autoscroll_speed;
- int allow_overlap;
};
struct _Cfg_File_Data
@@ -58,7 +57,6 @@
cfdata->iconsize = ib->conf->iconsize;
cfdata->follow_speed = ib->conf->follow_speed;
cfdata->autoscroll_speed = ib->conf->autoscroll_speed;
- cfdata->allow_overlap = ib->conf->allow_overlap;
}
static void *
@@ -97,9 +95,6 @@
e_widget_list_object_append(o, ob, 1, 1, 0.5);
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;
}
@@ -128,11 +123,6 @@
ib->conf->width = IBOX_WIDTH_FIXED;
}
- 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;
-
e_border_button_bindings_grab_all();
e_config_save_queue();
@@ -174,11 +164,6 @@
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- 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;
}
@@ -220,11 +205,6 @@
ib->conf->autoscroll_speed = cfdata->autoscroll_speed;
}
- 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;
-
e_border_button_bindings_grab_all();
e_config_save_queue();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- e_mod_main.c 20 Feb 2006 19:10:39 -0000 1.43
+++ e_mod_main.c 12 Mar 2006 16:12:58 -0000 1.44
@@ -203,7 +203,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, boxes, conf_box_edd);
ib->conf = e_config_domain_load("module.ibox", conf_edd);
@@ -215,13 +214,11 @@
ib->conf->autoscroll_speed = 0.95;
ib->conf->iconsize = 24;
ib->conf->width = IBOX_WIDTH_AUTO;
- ib->conf->allow_overlap = 0;
}
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);
_ibox_config_menu_new(ib);
@@ -401,11 +398,6 @@
if (ibb->ibox->conf->width == IBOX_WIDTH_FIXED)
policy |= E_GADMAN_POLICY_VSIZE;
- if (ibb->ibox->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);
@@ -723,11 +715,6 @@
policy = E_GADMAN_POLICY_EDGES | E_GADMAN_POLICY_HMOVE |
E_GADMAN_POLICY_VMOVE;
- if (ibb->ibox->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))
{
@@ -772,11 +759,6 @@
policy = E_GADMAN_POLICY_EDGES | E_GADMAN_POLICY_HMOVE |
E_GADMAN_POLICY_VMOVE;
- if (ibb->ibox->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/ibox/e_mod_main.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.h 20 Jan 2006 04:04:13 -0000 1.12
+++ e_mod_main.h 12 Mar 2006 16:12:58 -0000 1.13
@@ -19,7 +19,6 @@
int follower;
double autoscroll_speed;
int iconsize;
- int allow_overlap;
int width;
Evas_List *boxes;
};
-------------------------------------------------------
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
