summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2006-09-06 20:16:03 +0000
committerMatthias Melcher <fltk@matthiasm.com>2006-09-06 20:16:03 +0000
commit44264e3c4e46f44f9004c9701bc8b44d9c73a57c (patch)
tree6488148cab572e4ceff4ad83b0dd9237ba004339
parent7ac3b8e5b9cd4920c954cb3ba9011d07c4fb6b3d (diff)
Additional fix for STR #1415 for Xft font selection.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5425 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/fl_font_xft.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx
index 71fb3736d..4c87ca23a 100644
--- a/src/fl_font_xft.cxx
+++ b/src/fl_font_xft.cxx
@@ -96,6 +96,10 @@ const char* fl_encoding_ = "iso8859-1";
Fl_FontSize* fl_fontsize = 0;
void fl_font(int fnum, int size) {
+ if (fnum==-1) { // special case to stop font caching
+ fl_font_ = 0; fl_size_ = 0;
+ return;
+ }
if (fnum == fl_font_ && size == fl_size_
&& fl_fontsize
&& !strcasecmp(fl_fontsize->encoding, fl_encoding_))