1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-27 00:42:32 +01:00

Merge branch 'wmdrawer' into next

This commit is contained in:
Carlos R. Mafra
2013-04-12 02:14:41 +01:00
38 changed files with 3853 additions and 942 deletions

View File

@@ -246,11 +246,21 @@ static void icon_update_pixmap(WIcon *icon, RImage *image)
int theight = 0;
WScreen *scr = icon->core->screen_ptr;
if (icon->tile_type == TILE_NORMAL) {
switch (icon->tile_type) {
case TILE_NORMAL:
tile = RCloneImage(scr->icon_tile);
} else {
break;
default:
wwarning("Unknown tileType: %d.\n", icon->tile_type);
// fallthrough to TILE_CLIP (emulate previous behaviour)
case TILE_CLIP:
assert(scr->clip_tile);
tile = RCloneImage(scr->clip_tile);
break;
case TILE_DRAWER:
assert(scr->drawer_tile);
tile = RCloneImage(scr->drawer_tile);
break;
}
if (image) {