jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* enum for the background type (image/gradient/solid) 

* removed mode field in E_Background_Layer which wasn't used


SVN revision: 5550
This commit is contained in:
cpk 2001-10-21 22:36:56 +00:00 committed by cpk
parent 0a579b214a
commit 37e79eaea4
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/background.c
View File

@ -68,7 +68,7 @@ e_background_load(char *file)
ZERO(bl, E_Background_Layer, 1); ZERO(bl, E_Background_Layer, 1);
bg->layers = evas_list_append(bg->layers, bl); bg->layers = evas_list_append(bg->layers, bl);
sprintf(buf, "/layers/%i/type", i); e_db_int_get(db, buf, &(bl->type)); sprintf(buf, "/layers/%i/type", i); e_db_int_get(db, buf, (int*)&(bl->type));
sprintf(buf, "/layers/%i/inlined", i); e_db_int_get(db, buf, &(bl->inlined)); sprintf(buf, "/layers/%i/inlined", i); e_db_int_get(db, buf, &(bl->inlined));
sprintf(buf, "/layers/%i/color_class", i); bl->color_class = e_db_str_get(db, buf); sprintf(buf, "/layers/%i/color_class", i); bl->color_class = e_db_str_get(db, buf);
if (bl->inlined) if (bl->inlined)
@ -118,7 +118,7 @@ e_background_realize(E_Background *bg, Evas evas)
E_Background_Layer *bl; E_Background_Layer *bl;
bl = l->data; bl = l->data;
if (bl->type == 0) /* 0 == image */ if (bl->type == E_BACKGROUND_TYPE_IMAGE)
{ {
bl->obj = evas_add_image_from_file(bg->evas, bl->file); bl->obj = evas_add_image_from_file(bg->evas, bl->file);
evas_set_layer(bg->evas, bl->obj, 0); evas_set_layer(bg->evas, bl->obj, 0);
@ -136,10 +136,10 @@ e_background_realize(E_Background *bg, Evas evas)
} }
#endif #endif
} }
else if (bl->type == 1) /* 1 == gradient */ else if (bl->type == E_BACKGROUND_TYPE_GRADIENT)
{ {
} }
else if (bl->type == 2) /* 2 == solid */ else if (bl->type == E_BACKGROUND_TYPE_SOLID)
{ {
} }
} }
@ -165,7 +165,7 @@ e_background_set_scroll(E_Background *bg, int sx, int sy)
E_Background_Layer *bl; E_Background_Layer *bl;
bl = l->data; bl = l->data;
if (bl->type == 0) /* 0 == image */ if (bl->type == E_BACKGROUND_TYPE_IMAGE)
{ {
evas_set_image_fill(bg->evas, bl->obj, evas_set_image_fill(bg->evas, bl->obj,
(double)bg->geom.sx * bl->scroll.x, (double)bg->geom.sx * bl->scroll.x,
@ -213,18 +213,18 @@ e_background_set_size(E_Background *bg, int w, int h)
{ {
evas_move(bg->evas, bl->obj, bl->x, bl->y); evas_move(bg->evas, bl->obj, bl->x, bl->y);
evas_resize(bg->evas, bl->obj, bl->w, bl->h); evas_resize(bg->evas, bl->obj, bl->w, bl->h);
if (bl->type == 0) /* 0 == image */ if (bl->type == E_BACKGROUND_TYPE_IMAGE)
{ {
evas_set_image_fill(bg->evas, bl->obj, evas_set_image_fill(bg->evas, bl->obj,
(double)bg->geom.sx * bl->scroll.x, (double)bg->geom.sx * bl->scroll.x,
(double)bg->geom.sy * bl->scroll.y, (double)bg->geom.sy * bl->scroll.y,
bl->fw, bl->fh); bl->fw, bl->fh);
} }
else if (bl->type == 1) /* 1 == gradient */ else if (bl->type == E_BACKGROUND_TYPE_GRADIENT)
{ {
evas_set_angle(bg->evas, bl->obj, bl->angle); evas_set_angle(bg->evas, bl->obj, bl->angle);
} }
else if (bl->type == 2) /* 2 == solid */ else if (bl->type == E_BACKGROUND_TYPE_SOLID)
{ {
} }
} }

11
src/background.h
View File

@ -4,6 +4,14 @@
typedef struct _E_Background E_Background; typedef struct _E_Background E_Background;
typedef struct _E_Background_Layer E_Background_Layer; typedef struct _E_Background_Layer E_Background_Layer;
typedef enum
{
E_BACKGROUND_TYPE_IMAGE = 0,
E_BACKGROUND_TYPE_GRADIENT = 1,
E_BACKGROUND_TYPE_SOLID = 2
}
E_Background_Type;
struct _E_Background struct _E_Background
{ {
OBJ_PROPERTIES; OBJ_PROPERTIES;
@ -24,8 +32,7 @@ struct _E_Background
struct _E_Background_Layer struct _E_Background_Layer
{ {
int mode; E_Background_Type type;
int type;
int inlined; int inlined;
struct { struct {
float x, y; float x, y;