gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-26 08:22:37 +01:00
Code Issues Projects Releases Wiki Activity

drawIconTitle renamed

Browse Source 
The function drawIconTitle() only draw the icon title square, without
the title. The title must be set later, because yet is not initialized,
so is NULL.

Then, the right function name should be drawIconTitleBackground.

This patch also removes the variable titled.
This commit is contained in:
Rodolfo García Peñas (kix)
2013-04-08 19:40:48 +02:00
committed by Carlos R. Mafra
parent b3ca57674d
commit 2c0a449f00
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/icon.c
View File

@@ -229,7 +229,7 @@ void wIconDestroy(WIcon * icon)
wfree(icon);
}
static void drawIconTitle(WScreen * scr, Pixmap pixmap, int height)
static void drawIconTitleBackground(WScreen *scr, Pixmap pixmap, int height)
{
XFillRectangle(dpy, pixmap, scr->icon_title_texture->normal_gc, 0, 0, wPreferences.icon_size, height + 1);
XDrawLine(dpy, pixmap, scr->icon_title_texture->light_gc, 0, 0, wPreferences.icon_size, 0);
@@ -246,7 +246,6 @@ static void icon_update_pixmap(WIcon *icon, RImage *image)
unsigned w, h;
int theight = 0;
WScreen *scr = icon->core->screen_ptr;
int titled = icon->show_title;
if (icon->tile_type == TILE_NORMAL) {
tile = RCloneImage(scr->icon_tile);
@@ -261,7 +260,7 @@ static void icon_update_pixmap(WIcon *icon, RImage *image)
x = (wPreferences.icon_size - w) / 2;
sx = (image->width - w) / 2;
if (titled)
if (icon->show_title)
theight = WMFontHeight(scr->icon_title_font);
h = (image->height + theight > wPreferences.icon_size
@@ -295,8 +294,9 @@ static void icon_update_pixmap(WIcon *icon, RImage *image)
RReleaseImage(tile);
if (titled)
drawIconTitle(scr, pixmap, theight);
/* Draw the icon's title background (without text) */
if (icon->show_title)
drawIconTitleBackground(scr, pixmap, theight);
icon->pixmap = pixmap;
}