awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename draw_image to draw_image_from_file 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Michael Gehring 2008-06-03 20:28:38 +02:00 committed by Julien Danjou
parent 0afa1a41b7
commit d2f9c6518b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/draw.c
View File

@ -731,7 +731,7 @@ draw_image_from_argb_data(draw_context_t *ctx, int x, int y, int w, int h,
* \param filename file name to draw * \param filename file name to draw
*/ */
void void
draw_image(draw_context_t *ctx, int x, int y, int wanted_h, const char *filename) draw_image_from_file(draw_context_t *ctx, int x, int y, int wanted_h, const char *filename)
{ {
double ratio; double ratio;
@ -834,7 +834,7 @@ draw_imlib_load_strerror(Imlib_Load_Error e)
* \param filename file name to draw * \param filename file name to draw
*/ */
void void
draw_image(draw_context_t *ctx, int x, int y, int wanted_h, const char *filename) draw_image_from_file(draw_context_t *ctx, int x, int y, int wanted_h, const char *filename)
{ {
int w, h, size, i; int w, h, size, i;
DATA32 *data; DATA32 *data;

2
common/draw.h
View File

@ -140,7 +140,7 @@ void draw_graph_setup(draw_context_t *);
void draw_graph(draw_context_t *, area_t, int *, int *, int, position_t, area_t, xcolor_t *, xcolor_t *, xcolor_t *); void draw_graph(draw_context_t *, area_t, int *, int *, int, position_t, area_t, xcolor_t *, xcolor_t *, xcolor_t *);
void draw_graph_line(draw_context_t *, area_t, int *, int, position_t, area_t, xcolor_t *, xcolor_t *, xcolor_t *); void draw_graph_line(draw_context_t *, area_t, int *, int, position_t, area_t, xcolor_t *, xcolor_t *, xcolor_t *);
void draw_circle(draw_context_t *, int, int, int, bool, xcolor_t); void draw_circle(draw_context_t *, int, int, int, bool, xcolor_t);
void draw_image(draw_context_t *, int, int, int, const char *); void draw_image_from_file(draw_context_t *, int, int, int, const char *);
void draw_image_from_argb_data(draw_context_t *, int, int, int, int, int, unsigned char *); void draw_image_from_argb_data(draw_context_t *, int, int, int, int, int, unsigned char *);
area_t draw_get_image_size(const char *filename); area_t draw_get_image_size(const char *filename);
void draw_rotate(draw_context_t *, xcb_drawable_t, xcb_drawable_t, int, int, int, int, double, int, int); void draw_rotate(draw_context_t *, xcb_drawable_t, xcb_drawable_t, int, int, int, int, double, int, int);

2
widgets/iconbox.c
View File

@ -59,7 +59,7 @@ iconbox_draw(draw_context_t *ctx, int screen __attribute__ ((unused)),
w->area.y = 0; w->area.y = 0;
draw_image(ctx, w->area.x, w->area.y, draw_image_from_file(ctx, w->area.x, w->area.y,
d->resize ? ctx->height : 0, d->image); d->resize ? ctx->height : 0, d->image);
return w->area.width; return w->area.width;

2
widgets/tasklist.c
View File

@ -121,7 +121,7 @@ tasklist_draw(draw_context_t *ctx, int screen,
if(area.width > 0 && area.height > 0) if(area.width > 0 && area.height > 0)
{ {
icon_width = ((double) ctx->height / (double) area.height) * area.width; icon_width = ((double) ctx->height / (double) area.height) * area.width;
draw_image(ctx, draw_image_from_file(ctx,
w->area.x + box_width * i, w->area.x + box_width * i,
w->area.y, w->area.y,
ctx->height, ctx->height,