Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/elicit
Dir : e17/apps/elicit/src
Modified Files:
elicit.c shots.c swatches.c
Log Message:
mouse wheel support in panel
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/elicit.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- elicit.c 12 May 2004 19:13:30 -0000 1.15
+++ elicit.c 14 May 2004 14:23:44 -0000 1.16
@@ -187,16 +187,10 @@
edje_object_signal_callback_add(el->gui, "elicit,shot,save", "*",
elicit_shot_save_cb, el);
edje_object_signal_callback_add(el->gui, "drag", "swatch.scroll.bar",
elicit_swatch_scroll_cb, el);
- edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,up,start", "*",
elicit_swatch_scroll_cb, el);
- edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,up,stop", "*",
elicit_swatch_scroll_cb, el);
- edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,down,start", "*",
elicit_swatch_scroll_cb, el);
- edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,down,stop", "*",
elicit_swatch_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,*", "*",
elicit_swatch_scroll_cb, el);
edje_object_signal_callback_add(el->gui, "drag", "shot.scroll.bar",
elicit_shot_scroll_cb, el);
- edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,up,start", "*",
elicit_shot_scroll_cb, el);
- edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,up,stop", "*",
elicit_shot_scroll_cb, el);
- edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,down,start", "*",
elicit_shot_scroll_cb, el);
- edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,down,stop", "*",
elicit_shot_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,*", "*",
elicit_shot_scroll_cb, el);
evas_object_hide(el->gui);
evas_object_show(el->gui);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/shots.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- shots.c 14 May 2004 03:20:18 -0000 1.3
+++ shots.c 14 May 2004 14:23:44 -0000 1.4
@@ -151,14 +151,15 @@
evas_object_image_size_set(sh->shot, iw, ih);
evas_object_image_data_copy_set(sh->shot, data);
free(data);
+ evas_object_pass_events_set(sh->shot, TRUE);
evas_object_show(sh->shot);
edje_object_part_swallow(sh->obj, "shot", sh->shot);
esmart_container_element_append(el->shots.cont, sh->obj);
}
+ el->shots.length = esmart_container_elements_length_get(el->shots.cont);
e_db_close(db);
- e_db_flush();
}
@@ -208,6 +209,7 @@
evas_object_image_size_get(el->shot, &iw, &ih);
evas_object_image_size_set(sh->shot, iw, ih);
evas_object_image_data_copy_set(sh->shot, evas_object_image_data_get(el->shot,
TRUE));
+ evas_object_pass_events_set(sh->shot, TRUE);
evas_object_show(sh->shot);
edje_object_part_swallow(sh->obj, "shot", sh->shot);
esmart_container_element_append(el->shots.cont, sh->obj);
@@ -258,7 +260,8 @@
esmart_container_element_remove(el->shots.cont, sh->obj);
elicit_shot_free(sh);
-
+
+ el->shots.length = esmart_container_elements_length_get(el->shots.cont);
elicit_shots_save(el);
}
@@ -281,7 +284,7 @@
if (!strcmp(emission, "drag"))
{
- double l = esmart_container_elements_length_get(el->shots.cont);
+ double l = el->shots.length;
Evas_Coord h;
double vx, vy;
@@ -294,9 +297,13 @@
}
else if (!fnmatch("elicit,shot,scroll,up*", emission, 0))
{
- if (!strcmp(emission, "elicit,shot,scroll,up,start"))
+ if (!strcmp(emission, "elicit,shot,scroll,up"))
+ {
+ esmart_container_scroll(el->shots.cont, 5);
+ _elicit_shots_update_scroll_bar(el);
+ }
+ else if (!strcmp(emission, "elicit,shot,scroll,up,start"))
{
- el->shots.length = esmart_container_elements_length_get(el->shots.cont);
el->shots.scrolling = 1;
esmart_container_scroll_start(el->shots.cont, 1);
}
@@ -307,9 +314,13 @@
}
else
{
- if (!strcmp(emission, "elicit,shot,scroll,down,start"))
+ if (!strcmp(emission, "elicit,shot,scroll,down"))
+ {
+ esmart_container_scroll(el->shots.cont, -5);
+ _elicit_shots_update_scroll_bar(el);
+ }
+ else if (!strcmp(emission, "elicit,shot,scroll,down,start"))
{
- el->shots.length = esmart_container_elements_length_get(el->shots.cont);
el->shots.scrolling = 1;
esmart_container_scroll_start(el->shots.cont, -1);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/swatches.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- swatches.c 14 May 2004 03:20:18 -0000 1.3
+++ swatches.c 14 May 2004 14:23:44 -0000 1.4
@@ -138,10 +138,13 @@
edje_object_signal_callback_add(sw->obj, "elicit,swatch,name,show", "",
elicit_swatch_name_show_cb, sw);
evas_object_color_set(sw->rect, sw->r, sw->g, sw->b, 255);
+ evas_object_pass_events_set(sw->rect, TRUE);
evas_object_show(sw->rect);
edje_object_part_swallow(sw->obj, "swatch", sw->rect);
esmart_container_element_append(el->swatches.cont, sw->obj);
}
+ el->swatches.length = esmart_container_elements_length_get(el->swatches.cont);
+ e_db_close(db);
}
void
@@ -188,6 +191,7 @@
edje_object_signal_callback_add(sw->obj, "elicit,swatch,name,show", "",
elicit_swatch_name_show_cb, sw);
evas_object_color_set(sw->rect, sw->r, sw->g, sw->b, 255);
+ evas_object_pass_events_set(sw->rect, TRUE);
evas_object_show(sw->rect);
edje_object_part_swallow(sw->obj, "swatch", sw->rect);
esmart_container_element_append(el->swatches.cont, sw->obj);
@@ -234,6 +238,9 @@
esmart_container_element_remove(el->swatches.cont, sw->obj);
elicit_swatch_free(sw);
+ el->swatches.length = esmart_container_elements_length_get(el->swatches.cont);
+
+ /* FIXME if end of list is above bottom of cont, scroll to end */
elicit_swatches_save(el);
}
@@ -257,7 +264,7 @@
if (!strcmp(emission, "drag"))
{
- double l = esmart_container_elements_length_get(el->swatches.cont);
+ double l = el->swatches.length;
Evas_Coord h;
double vx, vy;
@@ -267,12 +274,20 @@
edje_object_part_drag_value_get(el->gui, source, &vx, &vy);
esmart_container_scroll_offset_set(el->swatches.cont, -vy*(l-h+10));
}
+ else
+ {
+ edje_object_part_drag_value_set(el->gui, source, .001, .001);
+ }
}
else if (!fnmatch("elicit,swatch,scroll,up*", emission, 0))
{
- if (!strcmp(emission, "elicit,swatch,scroll,up,start"))
+ if (!strcmp(emission, "elicit,swatch,scroll,up"))
+ {
+ esmart_container_scroll(el->swatches.cont, 5);
+ _elicit_swatches_update_scroll_bar(el);
+ }
+ else if (!strcmp(emission, "elicit,swatch,scroll,up,start"))
{
- el->swatches.length = esmart_container_elements_length_get(el->swatches.cont);
el->swatches.scrolling = 1;
esmart_container_scroll_start(el->swatches.cont, 1);
}
@@ -284,9 +299,13 @@
}
else
{
- if (!strcmp(emission, "elicit,swatch,scroll,down,start"))
+ if (!strcmp(emission, "elicit,swatch,scroll,down"))
+ {
+ esmart_container_scroll(el->swatches.cont, -5);
+ _elicit_swatches_update_scroll_bar(el);
+ }
+ else if (!strcmp(emission, "elicit,swatch,scroll,down,start"))
{
- el->swatches.length = esmart_container_elements_length_get(el->swatches.cont);
el->swatches.scrolling = 1;
esmart_container_scroll_start(el->swatches.cont, -1);
}
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
