gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

Function makeIcon removed

Browse Source 
The function makeIcon is only used in icon_update_pixmap(), so
both functions can be joined. Now the function icon_update_pixmap()
includes the contents of makeIcon.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-10-23 23:59:58 +02:00
committed by Carlos R. Mafra
parent ff9f942c47
commit f3d36b1c26
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/icon.c
View File

@@ -64,9 +64,6 @@ static void get_pixmap_icon_from_icon_win(WIcon *icon);
static int get_pixmap_icon_from_wm_hints(WIcon *icon); static int get_pixmap_icon_from_wm_hints(WIcon *icon);
static void get_pixmap_icon_from_user_icon(WIcon *icon); static void get_pixmap_icon_from_user_icon(WIcon *icon);
static Pixmap makeIcon(WScreen *scr, RImage *image,
int titled, int shadowed,
int tileType, int highlighted);
static void icon_update_pixmap(WIcon *icon, RImage *image); static void icon_update_pixmap(WIcon *icon, RImage *image);
static RImage *get_default_image(WScreen *scr); static RImage *get_default_image(WScreen *scr);
@@ -273,24 +270,16 @@ static void drawIconTitle(WScreen * scr, Pixmap pixmap, int height)
} }
static void icon_update_pixmap(WIcon *icon, RImage *image) static void icon_update_pixmap(WIcon *icon, RImage *image)
{
WScreen *scr = icon->core->screen_ptr;
/* Update the WIcon pixmap */
icon->pixmap = makeIcon(scr, image,
icon->show_title, icon->shadowed,
icon->tile_type, icon->highlighted);
}
static Pixmap makeIcon(WScreen *scr, RImage *image, int titled, int shadowed, int tileType, int highlighted)
{ {
RImage *tile; RImage *tile;
Pixmap pixmap; Pixmap pixmap;
int x, y, sx, sy; int x, y, sx, sy;
unsigned w, h; unsigned w, h;
int theight = 0; int theight = 0;
WScreen *scr = icon->core->screen_ptr;
int titled = icon->show_title;
if (tileType == TILE_NORMAL) { if (icon->tile_type == TILE_NORMAL) {
tile = RCloneImage(scr->icon_tile); tile = RCloneImage(scr->icon_tile);
} else { } else {
assert(scr->clip_tile); assert(scr->clip_tile);
@@ -314,7 +303,7 @@ static Pixmap makeIcon(WScreen *scr, RImage *image, int titled, int shadowed, in
RCombineArea(tile, image, sx, sy, w, h, x, y); RCombineArea(tile, image, sx, sy, w, h, x, y);
} }
if (shadowed) { if (icon->shadowed) {
RColor color; RColor color;
color.red = scr->icon_back_texture->light.red >> 8; color.red = scr->icon_back_texture->light.red >> 8;
@@ -324,7 +313,7 @@ static Pixmap makeIcon(WScreen *scr, RImage *image, int titled, int shadowed, in
RClearImage(tile, &color); RClearImage(tile, &color);
} }
if (highlighted) { if (icon->highlighted) {
RColor color; RColor color;
color.red = color.green = color.blue = 0; color.red = color.green = color.blue = 0;
@@ -340,7 +329,7 @@ static Pixmap makeIcon(WScreen *scr, RImage *image, int titled, int shadowed, in
if (titled) if (titled)
drawIconTitle(scr, pixmap, theight); drawIconTitle(scr, pixmap, theight);
return pixmap; icon->pixmap = pixmap;
} }
void wIconChangeTitle(WIcon * icon, char *new_title) void wIconChangeTitle(WIcon * icon, char *new_title)