mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-23 22:52:34 +01:00
get_pixmap_icon_from_wm_hints uses getSize
The function get_pixmap_icon_from_wm_hints() now uses getSize() and the code dup is removed.
This commit is contained in:
committed by
Carlos R. Mafra
parent
d5e5ae6ca0
commit
0493974cbc
@@ -728,15 +728,14 @@ static void get_pixmap_icon_from_icon_win(WIcon * icon)
|
||||
/* Get the Pixmap from the XWindow wm_hints */
|
||||
static int get_pixmap_icon_from_wm_hints(WIcon *icon)
|
||||
{
|
||||
Window jw;
|
||||
Pixmap pixmap;
|
||||
unsigned int w, h, ju, d;
|
||||
int ji, x, y;
|
||||
unsigned int w, h, d;
|
||||
int x, y;
|
||||
WWindow *wwin = icon->owner;
|
||||
WScreen *scr = icon->core->screen_ptr;
|
||||
int title_height = WMFontHeight(scr->icon_title_font);
|
||||
|
||||
if (!XGetGeometry(dpy, wwin->wm_hints->icon_pixmap, &jw, &ji, &ji, &w, &h, &ju, &d)) {
|
||||
if (!getSize(wwin->wm_hints->icon_pixmap, &w, &h, &d)) {
|
||||
icon->owner->wm_hints->flags &= ~IconPixmapHint;
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user