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

New icon_update_pixmap helper function

Browse Source 
The function icon_update_pixmap updates the WIcon's pixmap,
using the values in the WIcon struct.

This function provices a clear function to update the icon,
using only the icon, and the new image to set. This option is
better than using "makeIcon" function, with a lot of arguments.

This patch also changes the variable name "icon" to "image",
because is type rimage and then both functions uses the same name.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-10-23 23:59:54 +02:00
committed by Carlos R. Mafra
parent f9847da97c
commit 948dde0abd
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/icon.c
View File

@@ -63,6 +63,11 @@ static WIcon *icon_create_core(WScreen *scr, int coord_x, int coord_y);
void get_pixmap_icon_from_icon_win(WIcon *icon); void get_pixmap_icon_from_icon_win(WIcon *icon);
int get_pixmap_icon_from_wm_hints(WIcon *icon); int get_pixmap_icon_from_wm_hints(WIcon *icon);
void get_pixmap_icon_from_user_icon(WIcon *icon); 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);
/****** Notification Observers ******/ /****** Notification Observers ******/
static void appearanceObserver(void *self, WMNotification * notif) static void appearanceObserver(void *self, WMNotification * notif)
@@ -265,7 +270,17 @@ static void drawIconTitle(WScreen * scr, Pixmap pixmap, int height)
wPreferences.icon_size - 1, 0, wPreferences.icon_size - 1, height + 1); wPreferences.icon_size - 1, 0, wPreferences.icon_size - 1, height + 1);
} }
static Pixmap makeIcon(WScreen *scr, RImage *icon, int titled, int shadowed, int tileType, int highlighted) 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;
@@ -280,21 +295,21 @@ static Pixmap makeIcon(WScreen *scr, RImage *icon, int titled, int shadowed, int
tile = RCloneImage(scr->clip_tile); tile = RCloneImage(scr->clip_tile);
} }
if (icon) { if (image) {
w = (icon->width > wPreferences.icon_size) w = (image->width > wPreferences.icon_size)
? wPreferences.icon_size : icon->width; ? wPreferences.icon_size : image->width;
x = (wPreferences.icon_size - w) / 2; x = (wPreferences.icon_size - w) / 2;
sx = (icon->width - w) / 2; sx = (image->width - w) / 2;
if (titled) if (titled)
theight = WMFontHeight(scr->icon_title_font); theight = WMFontHeight(scr->icon_title_font);
h = (icon->height + theight > wPreferences.icon_size h = (image->height + theight > wPreferences.icon_size
? wPreferences.icon_size - theight : icon->height); ? wPreferences.icon_size - theight : image->height);
y = theight + (wPreferences.icon_size - theight - h) / 2; y = theight + (wPreferences.icon_size - theight - h) / 2;
sy = (icon->height - h) / 2; sy = (image->height - h) / 2;
RCombineArea(tile, icon, sx, sy, w, h, x, y); RCombineArea(tile, image, sx, sy, w, h, x, y);
} }
if (shadowed) { if (shadowed) {
@@ -590,8 +605,7 @@ void wIconUpdate(WIcon *icon)
get_pixmap_icon_from_icon_win(icon); get_pixmap_icon_from_icon_win(icon);
} else if (wwin && wwin->net_icon_image) { } else if (wwin && wwin->net_icon_image) {
/* Use _NET_WM_ICON icon */ /* Use _NET_WM_ICON icon */
icon->pixmap = makeIcon(scr, wwin->net_icon_image, icon->show_title, icon_update_pixmap(icon, wwin->net_icon_image);
icon->shadowed, icon->tile_type, icon->highlighted);
} else if (wwin && wwin->wm_hints && (wwin->wm_hints->flags & IconPixmapHint)) { } else if (wwin && wwin->wm_hints && (wwin->wm_hints->flags & IconPixmapHint)) {
/* Get the Pixmap from the wm_hints, else, from the user */ /* Get the Pixmap from the wm_hints, else, from the user */
if (get_pixmap_icon_from_wm_hints(icon)) if (get_pixmap_icon_from_wm_hints(icon))
@@ -617,8 +631,7 @@ void get_pixmap_icon_from_user_icon(WIcon *icon)
WScreen *scr = icon->core->screen_ptr; WScreen *scr = icon->core->screen_ptr;
if (icon->file_image) { if (icon->file_image) {
icon->pixmap = makeIcon(scr, icon->file_image, icon->show_title, icon_update_pixmap(icon, icon->file_image);
icon->shadowed, icon->tile_type, icon->highlighted);
} else { } else {
/* make default icons */ /* make default icons */
if (!scr->def_icon_pixmap) { if (!scr->def_icon_pixmap) {