Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c image.c image.h main.c signals_image.c
Log Message:
use Evas_Coord
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- entice.c 24 Apr 2004 18:19:15 -0000 1.52
+++ entice.c 27 Apr 2004 23:06:23 -0000 1.53
@@ -121,7 +121,7 @@
edje_object_file_set(o, entice_config_theme_get(), "entice");
evas_object_name_set(o, "EnticeEdje");
evas_object_move(o, 0, 0);
- evas_object_resize(o, w, h);
+ evas_object_resize(o, (Evas_Coord) w, (Evas_Coord) h);
evas_object_layer_set(o, 0);
edje_object_size_min_get(o, &ew, &eh);
@@ -171,15 +171,15 @@
if (ew > eh)
{
esmart_container_fill_policy_set(e->container,
- CONTAINER_FILL_POLICY_FILL_Y |
- CONTAINER_FILL_POLICY_KEEP_ASPECT);
+ CONTAINER_FILL_POLICY_FILL_Y |
+ CONTAINER_FILL_POLICY_KEEP_ASPECT);
esmart_container_direction_set(e->container, 0);
}
else
{
esmart_container_fill_policy_set(e->container,
- CONTAINER_FILL_POLICY_FILL_X |
- CONTAINER_FILL_POLICY_KEEP_ASPECT);
+ CONTAINER_FILL_POLICY_FILL_X |
+ CONTAINER_FILL_POLICY_KEEP_ASPECT);
esmart_container_direction_set(e->container, 1);
}
edje_object_part_swallow(e->edje, "entice.thumbnail.area",
@@ -197,10 +197,11 @@
o = esmart_trans_x11_new(ecore_evas_get(ee));
evas_object_layer_set(o, 0);
evas_object_move(o, 0, 0);
- evas_object_resize(o, w, h);
+ evas_object_resize(o, (Evas_Coord) w, (Evas_Coord) h);
evas_object_name_set(o, "trans");
- esmart_trans_x11_freshen(o, x, y, w, h);
+ esmart_trans_x11_freshen(o, (Evas_Coord) x, (Evas_Coord) y,
+ (Evas_Coord) w, (Evas_Coord) h);
evas_object_show(o);
ecore_evas_borderless_set(ee, 1);
}
@@ -431,7 +432,6 @@
{
if ((o = esmart_thumb_new(ecore_evas_get(entice->ee), buf)))
{
-
evas_object_layer_set(o,
evas_object_layer_get(entice->container));
edje = edje_object_add(ecore_evas_get(entice->ee));
@@ -445,7 +445,7 @@
{
entice->thumb.list =
evas_list_append(entice->thumb.list, o);
- evas_object_resize(o, 48, 48);
+ evas_object_resize(o, (Evas_Coord) 48, (Evas_Coord) 48);
hookup_entice_thumb_signals(edje, o);
evas_object_layer_set(o,
evas_object_layer_get(entice->
@@ -480,7 +480,10 @@
}
}
else
+ {
+ fprintf(stderr, "FUDGE YO\n");
result = 1;
+ }
}
else
result = 2;
@@ -841,16 +844,17 @@
if (entice && entice->edje && entice->current)
{
- double ww, hh;
+ Evas_Coord ww, hh;
- evas_object_resize(entice->edje, (double) w, (double) h);
+ evas_object_resize(entice->edje, (Evas_Coord) w, (Evas_Coord) h);
edje_object_part_geometry_get(entice->edje, "entice.image", NULL, NULL,
&ww, &hh);
evas_object_resize(entice->current, ww, hh);
if ((o = evas_object_name_find(ecore_evas_get(entice->ee), "trans")))
{
ecore_evas_geometry_get(entice->ee, &ex, &ey, &ew, &eh);
- esmart_trans_x11_freshen(o, ex, ey, ew, eh);
+ esmart_trans_x11_freshen(o, (Evas_Coord) ex, (Evas_Coord) ey,
+ (Evas_Coord) ew, (Evas_Coord) eh);
}
}
}
@@ -863,7 +867,7 @@
if (o && entice && entice->edje)
{
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
if (esmart_thumb_freshen(o) == EPSILON_OK)
{
@@ -910,7 +914,7 @@
* an artifact immediately before a preview request happens
*/
evas_object_move(newpreview, -50, -50);
- evas_object_resize(newpreview, 48, 48);
+ evas_object_resize(newpreview, (Evas_Coord) 48, (Evas_Coord) 48);
edje_object_part_swallow(entice->edje, "entice.preview", newpreview);
evas_object_show(newpreview);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- image.c 24 Apr 2004 18:19:15 -0000 1.44
+++ image.c 27 Apr 2004 23:06:23 -0000 1.45
@@ -677,7 +677,7 @@
}
}
static void
-entice_image_move(Evas_Object * o, double x, double y)
+entice_image_move(Evas_Object * o, Evas_Coord x, Evas_Coord y)
{
Entice_Image *im = NULL;
@@ -694,13 +694,13 @@
}
}
static void
-entice_image_resize(Evas_Object * o, double w, double h)
+entice_image_resize(Evas_Object * o, Evas_Coord w, Evas_Coord h)
{
Entice_Image *im = NULL;
if ((im = evas_object_smart_data_get(o)))
{
- double ww = 0.0, hh = 0.0;
+ Evas_Coord ww = 0.0, hh = 0.0;
im->w = w;
im->h = h;
@@ -712,8 +712,8 @@
if (im->zoom > w || im->zoom > h)
im->zoom = w < h ? w : h;
- ww = (int) ((double) im->iw / im->zoom);
- hh = (int) ((double) im->ih / im->zoom);
+ ww = (Evas_Coord) ((double) im->iw / im->zoom);
+ hh = (Evas_Coord) ((double) im->ih / im->zoom);
#if 0
if (ww > w)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/image.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- image.h 8 Apr 2004 18:33:42 -0000 1.23
+++ image.h 27 Apr 2004 23:06:24 -0000 1.24
@@ -51,7 +51,8 @@
char *format; /* we need to keep track of this too */
Entice_Image_Moving_State state;
/* current moving state */
- int x, y, w, h, iw, ih; /* geometry */
+ Evas_Coord x, y, w, h; /* geometry */
+ int iw, ih; /* image size */
Evas_Coord dx, dy;
Evas_Object *obj; /* the image object */
Evas_Object *clip; /* clip to this area when we swallow */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- main.c 18 Apr 2004 16:47:43 -0000 1.28
+++ main.c 27 Apr 2004 23:06:24 -0000 1.29
@@ -57,10 +57,12 @@
if (!ecore_evas_fullscreen_get(ee))
entice_config_geometry_set(x, y, w, h);
entice_resize(w, h);
+ fprintf(stderr, "Resize to %d:%d\n", w, h);
if ((o = evas_object_name_find(ecore_evas_get(ee), "trans")))
{
evas_object_resize(o, (Evas_Coord) w, (Evas_Coord) h);
- esmart_trans_x11_freshen(o, x, y, w, h);
+ esmart_trans_x11_freshen(o, (Evas_Coord) x, (Evas_Coord) y,
+ (Evas_Coord) w, (Evas_Coord) h);
}
}
}
@@ -80,7 +82,8 @@
ecore_evas_geometry_get(ee, &x, &y, &w, &h);
entice_config_geometry_set(x, y, w, h);
if ((o = evas_object_name_find(ecore_evas_get(ee), "trans")))
- esmart_trans_x11_freshen(o, x, y, w, h);
+ esmart_trans_x11_freshen(o, (Evas_Coord) x, (Evas_Coord) y,
+ (Evas_Coord) w, (Evas_Coord) h);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_image.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- signals_image.c 8 Apr 2004 00:07:37 -0000 1.12
+++ signals_image.c 27 Apr 2004 23:06:24 -0000 1.13
@@ -482,8 +482,10 @@
if (edje_object_part_exists(o, source))
{
edje_object_part_geometry_get(o, source, &x, &y, &w, &h);
+#if DEBUG
fprintf(stderr, "Seek on %s(%0.2f,%0.2f,%0.2f, %0.2f)\n", source, x, y,
w, h);
+#endif
}
}
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
