Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-05 16:12:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Setting a default font for Xft

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6862 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2009-09-13 10:15:42 +00:00
parent 9017c16ecd
commit dc5a320cc6
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.3.0 CHANGES IN FLTK 1.3.0
- Setting a default font for Xft (STR #2216)
- Avoiding lockup if two popups collide (STR #1986)
- Temporarily limited builds to 32-bit on OX S to stay - Temporarily limited builds to 32-bit on OX S to stay
compatible to Snow Leopard compatible to Snow Leopard
- Fixed Windows compile bug with "#define USE_COLORMAP 0" - Fixed Windows compile bug with "#define USE_COLORMAP 0"
src/fl_font_xft.cxx
+3
View File
@@ -499,6 +499,9 @@ void fl_destroy_xft_draw(Window id) {
} }
void fl_draw(const char *str, int n, int x, int y) { void fl_draw(const char *str, int n, int x, int y) {
if ( !current_font ) {
fl_font(FL_HELVETICA, 14);
}
#if USE_OVERLAY #if USE_OVERLAY
XftDraw*& draw = fl_overlay ? draw_overlay : ::draw; XftDraw*& draw = fl_overlay ? draw_overlay : ::draw;
if (fl_overlay) { if (fl_overlay) {