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

fixed cosmetic bug in geom. dpy window for 8bpp

Browse Source 
removed --enable-kanji and added MultiByteText option
rewrote font code to use WINGs
made autoraise only work for the active window
fixed compilation problem with OpenWindows and other non-X11R6 systems..
This commit is contained in:
kojima
1999-05-30 05:02:55 +00:00
parent a498d53fda
commit 3d5f435be7
24 changed files with 235 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/icon.c
View File

@@ -308,7 +308,7 @@ makeIcon(WScreen *scr, RImage *icon, int titled, int shadowed, int tileType)
Pixmap pixmap;
int x, y, sx, sy;
unsigned w, h;
int theight = scr->icon_title_font->height;
int theight = WMFontHeight(scr->icon_title_font);
if (tileType == TILE_NORMAL)
tile = RCloneImage(scr->icon_tile);
@@ -605,7 +605,7 @@ void
wIconUpdate(WIcon *icon)
{
WScreen *scr = icon->core->screen_ptr;
int title_height = scr->icon_title_font->height;
int title_height = WMFontHeight(scr->icon_title_font);
WWindow *wwin = icon->owner;
assert(scr->icon_tile!=NULL);
@@ -815,15 +815,15 @@ wIconPaint(WIcon *icon)
tmp = ShrinkString(scr->icon_title_font, icon->icon_name,
wPreferences.icon_size-4);
w = wTextWidth(scr->icon_title_font->font, tmp, l=strlen(tmp));
w = WMWidthOfString(scr->icon_title_font, tmp, l=strlen(tmp));
if (w > icon->core->width - 4)
x = (icon->core->width - 4) - w;
else
x = (icon->core->width - w)/2;
wDrawString(icon->core->window, scr->icon_title_font, gc,
x, 1 + scr->icon_title_font->y, tmp, l);
WMDrawString(scr->wmscreen, icon->core->window, gc,
scr->icon_title_font, x, 1, tmp, l);
free(tmp);
}