diff options
| author | Jody Goldberg <jody@gnome.org> | 2003-10-28 20:46:08 +0000 |
|---|---|---|
| committer | Jody Goldberg <jody@src.gnome.org> | 2003-10-28 20:46:08 +0000 |
| commit | 6d257e030ea9720342c16ebf35b2e779d4f075b0 (patch) | |
| tree | 1bd9e43d5ebbb40b84b21e032ac0f7990bdb283f | |
| parent | 3c9f4ea6ed42148cde787a52a0122fd91635ba81 (diff) | |
| download | gnome-control-center-6d257e030ea9720342c16ebf35b2e779d4f075b0.tar.gz | |
http://bugzilla.gnome.org/show_bug.cgi?id=124513 merge in patch to
2003-10-24 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=124513
* main.c (setup_font_sample) : merge in patch to allocate black and
white correctly on TruColor displays.
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | capplets/font/ChangeLog | 6 | ||||
| -rw-r--r-- | capplets/font/main.c | 15 |
3 files changed, 20 insertions, 2 deletions
@@ -5,6 +5,7 @@ Jody: xkb-properties-capplet * http://bugzilla.gnome.org/show_bug.cgi?id=120842 [HIGification broke accessx] * http://bugzilla.gnome.org/show_bug.cgi?id=106489 [protect against gconf failure] + * http://bugzilla.gnome.org/show_bug.cgi?id=124513 [Handle TruColor Displays] ------------------------------------------------------------------------------ diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog index e3ca13b7e..5e098b162 100644 --- a/capplets/font/ChangeLog +++ b/capplets/font/ChangeLog @@ -1,3 +1,9 @@ +2003-10-24 Jody Goldberg <jody@gnome.org> + + http://bugzilla.gnome.org/show_bug.cgi?id=124513 + * main.c (setup_font_sample) : merge in patch to allocate black and + white correctly on TruColor displays. + 2003-10-23 Jody Goldberg <jody@gnome.org> http://bugzilla.gnome.org/show_bug.cgi?id=106489 diff --git a/capplets/font/main.c b/capplets/font/main.c index 0d447811b..474f3ad55 100644 --- a/capplets/font/main.c +++ b/capplets/font/main.c @@ -202,8 +202,8 @@ setup_font_sample (GtkWidget *darea, const char *string1 = "abcfgop AO "; const char *string2 = "abcfgop"; - XftColor black = { 0, { 0, 0, 0, 0xffff } }; - XftColor white = { 0, { 0xffff, 0xffff, 0xffff, 0xffff } }; + XftColor black, white; + XRenderColor rendcolor; Display *xdisplay = gdk_x11_get_default_xdisplay (); @@ -265,6 +265,17 @@ setup_font_sample (GtkWidget *darea, draw = XftDrawCreate (xdisplay, GDK_DRAWABLE_XID (pixmap), xvisual, xcolormap); + rendcolor.red = 0; + rendcolor.green = 0; + rendcolor.blue = 0; + rendcolor.alpha = 0xffff; + XftColorAllocValue (xdisplay, xvisual, xcolormap, &rendcolor, &black); + + rendcolor.red = 0xffff; + rendcolor.green = 0xffff; + rendcolor.blue = 0xffff; + rendcolor.alpha = 0xffff; + XftColorAllocValue (xdisplay, xvisual, xcolormap, &rendcolor, &white); XftDrawRect (draw, &white, 0, 0, width, height); if (font1) XftDrawStringUtf8 (draw, &black, font1, |