mirror of https://github.com/fltk/fltk
Setting a default font for Xft
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6864 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
8baf86e4bb
commit
b6bc5c7ec9
1
CHANGES
1
CHANGES
|
@ -1,5 +1,6 @@
|
|||
CHANGES IN FLTK 1.1.10
|
||||
|
||||
- Setting a default font for Xft (STR #2216)
|
||||
- Temporarily limited builds to 32-bit on OX S to stay
|
||||
compatible to Snow Leopard
|
||||
- Fixed Windows compile bug with "#define USE_COLORMAP 0"
|
||||
|
|
|
@ -387,6 +387,9 @@ void fl_destroy_xft_draw(Window id) {
|
|||
}
|
||||
|
||||
void fl_draw(const char *str, int n, int x, int y) {
|
||||
if ( !current_font ) {
|
||||
fl_font(FL_HELVETICA, 14);
|
||||
}
|
||||
#if USE_OVERLAY
|
||||
XftDraw*& draw = fl_overlay ? draw_overlay : ::draw;
|
||||
if (fl_overlay) {
|
||||
|
|
Loading…
Reference in New Issue