gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-02-14 04:45:57 +01:00
Code Issues Projects Releases Wiki Activity

WPrefs: consolidate the 2 createImages static functions into a global one

Browse Source
This commit is contained in:
Daniel Déchelotte
2013-04-12 01:42:31 +02:00
committed by Carlos R. Mafra
parent 9548c42b71
commit 4b44020488
4 changed files with 100 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
WPrefs.app/WPrefs.c
View File

@@ -392,6 +392,61 @@ char *LocateImage(char *name)
return path;
}
void CreateImages(WMScreen *scr, RContext *rc, RImage *xis, char *file,
WMPixmap **icon_normal, WMPixmap **icon_greyed)
{
RImage *icon;
char *path;
RColor gray = { 0xae, 0xaa, 0xae, 0 };
path = LocateImage(file);
if (!path)
{
*icon_normal = NULL;
if (icon_greyed)
*icon_greyed = NULL;
return;
}
*icon_normal = WMCreatePixmapFromFile(scr, path);
if (!*icon_normal)
{
wwarning(_("could not load icon %s"), path);
if (icon_greyed)
*icon_greyed = NULL;
wfree(path);
return;
}
if (!icon_greyed) // Greyed-out version not requested, we are done
{
wfree(path);
return;
}
icon = RLoadImage(rc, path, 0);
if (!icon)
{
wwarning(_("could not load icon %s"), path);
*icon_greyed = NULL;
wfree(path);
return;
}
RCombineImageWithColor(icon, &gray);
if (xis)
{
RCombineImagesWithOpaqueness(icon, xis, 180);
}
*icon_greyed = WMCreatePixmapFromRImage(scr, icon, 127);
if (!*icon_greyed)
{
wwarning(_("could not process icon %s: %s"), path, RMessageForError(RErrorCode));
}
RReleaseImage(icon);
wfree(path);
}
static WMPixmap *makeTitledIcon(WMScreen * scr, WMPixmap * icon, char *title1, char *title2)
{
return WMRetainPixmap(icon);