1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-12 19:06:36 +00:00

Fixed a regression with font rendering.

Fixed a regression which causes fonts to not be rendered properly with
certain types of windows.
This commit is contained in:
Brenden Matthews 2009-06-09 18:39:26 -06:00
parent 4b1728316e
commit 2469b9bea9
4 changed files with 7 additions and 2 deletions

View File

@ -1,4 +1,6 @@
2009-06-09 2009-06-09
* Fixed a regression which causes fonts to not be rendered properly with
certain types of windows
* Added format_human_readable option (sf.net #2803345, thanks Vincent) * Added format_human_readable option (sf.net #2803345, thanks Vincent)
* Fix bug in comments within TEXT (where the line contains just '#') * Fix bug in comments within TEXT (where the line contains just '#')
(sf.net #2803586), thanks Pavelo (sf.net #2803586), thanks Pavelo

View File

@ -6653,6 +6653,7 @@ static void draw_text(void)
/* draw text */ /* draw text */
special_index = 0; special_index = 0;
} }
setup_fonts();
#endif /* X11 */ #endif /* X11 */
for_each_line(text_buffer, draw_line); for_each_line(text_buffer, draw_line);
} }

View File

@ -38,7 +38,10 @@ void setup_fonts(void)
return; return;
} }
#ifdef XFT #ifdef XFT
if (use_xft && !window.xftdraw) { if (use_xft) {
if (window.xftdraw) {
XftDrawDestroy(window.xftdraw);
}
window.xftdraw = XftDrawCreate(display, window.drawable, window.xftdraw = XftDrawCreate(display, window.drawable,
DefaultVisual(display, screen), DefaultColormap(display, screen)); DefaultVisual(display, screen), DefaultColormap(display, screen));
} }

View File

@ -230,7 +230,6 @@ void init_window(int own_window, int w, int h, int set_trans, int back_colour,
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
if (own_window) { if (own_window) {
if (!find_desktop_window(&window.root, &window.desktop)) { if (!find_desktop_window(&window.root, &window.desktop)) {
return; return;
} }