AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 22:10:08 +00:00
Code Issues Projects Releases Wiki Activity

respect boldness and italic

Browse Source
This commit is contained in:
cinamod 2003-09-02 22:09:49 +00:00
parent cc4836c90b
commit 15dbb7c912
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/engines/ms-windows/ChangeLog.old
View File

@ -1,3 +1,7 @@
2003-09-02 Dom Lachowicz <cinamod@hotmail.com>
* src/wimp_style.c: We now honor font preferences being bold or italic
2003-08-29 Dom Lachowicz <cinamod@hotmail.com> 2003-08-29 Dom Lachowicz <cinamod@hotmail.com>
* src/*.c: Theme GTK toolbar arrows to XP chevrons, once my GTK patch is committed. * src/*.c: Theme GTK toolbar arrows to XP chevrons, once my GTK patch is committed.

44
modules/engines/ms-windows/wimp_style.c
View File

@ -153,13 +153,53 @@ sys_font_to_pango_font (SystemFontType type, char * buf)
{ {
LOGFONT lf; LOGFONT lf;
int pt_size; int pt_size;
const char * weight;
const char * style;
/*
TODO: I don't think that pango font descriptions let you set these
BYTE lfUnderline; underline=single|none
BYTE lfStrikeOut; strikethrough=true|false
*/
if (get_system_font(type, &lf)) if (get_system_font(type, &lf))
{ {
switch (lf.lfWeight) {
case FW_THIN:
case FW_EXTRALIGHT:
weight = "ultralight";
break;
case FW_LIGHT:
weight = "light";
break;
case FW_SEMIBOLD:
case FW_BOLD:
weight = "bold";
break;
case FW_ULTRABOLD:
weight = "ultrabold";
break;
case FW_HEAVY:
weight = "heavy";
default:
weight = "normal";
break;
}
if (lf.lfItalic)
style="italic";
else
style="normal";
pt_size = -MulDiv(lf.lfHeight, 72, pt_size = -MulDiv(lf.lfHeight, 72,
GetDeviceCaps(GetDC(GetDesktopWindow()), GetDeviceCaps(GetDC(GetDesktopWindow()),
LOGPIXELSY)); LOGPIXELSY));
sprintf(buf, "%s %d", lf.lfFaceName, pt_size); sprintf(buf, "%s %s %s %d", lf.lfFaceName, style, weight, pt_size);
return buf; return buf;
} }
@ -170,7 +210,7 @@ sys_font_to_pango_font (SystemFontType type, char * buf)
static void static void
setup_system_font(GtkStyle *style) setup_system_font(GtkStyle *style)
{ {
char buf[64], * font; /* It's okay, lfFaceName is smaller than 32 chars */ char buf[256], * font; /* It's okay, lfFaceName is smaller than 32 chars */
if ((font = sys_font_to_pango_font(MESSAGE_FONT, buf)) != NULL) if ((font = sys_font_to_pango_font(MESSAGE_FONT, buf)) != NULL)
{ {