mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regression calling fl_font() w/o draw context

Browse Source 
According to the documentation fl_font(face, size) may be called
"outside a draw context if necessary to call fl_width()".

This worked in 1.3.5 but did not in 1.4 (so far). I reworded the
docs to make clear that other measurement functions can be called
as well and refactored the code to make sure that fl_font(face, size)
will open the display if necessary.
This commit is contained in:
Albrecht Schlosser 2020-02-03 16:35:28 +01:00
parent b8ab77e39c
commit dd3485c57a
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FL/fl_draw.H
View File

@ -574,16 +574,11 @@ FL_EXPORT void fl_rescale_offscreen(Fl_Offscreen &ctx);
/* NOTE: doxygen comments here to avoid triplication in os-specific sources */
// Fonts:
/**
/*
Sets the current font, which is then used in various drawing routines.
You may call this outside a draw context if necessary to call fl_width(),
but on X this will open the display.
The font is identified by a \p face and a \p size.
The size of the font is measured in pixels and not "points".
Lines should be spaced \p size pixels apart or more.
Implemented and documented in src/Fl_Graphics_Driver.cxx
*/
inline void fl_font(Fl_Font face, Fl_Fontsize fsize) { fl_graphics_driver->font(face,fsize); }
void fl_font(Fl_Font face, Fl_Fontsize fsize);
/**
Returns the \p face set by the most recent call to fl_font().

16
src/Fl_Graphics_Driver.cxx
View File

@ -557,6 +557,22 @@ void Fl_Graphics_Driver::rtl_draw(const char *str, int nChars, int x, int y) {
/** Returns non-zero if the graphics driver possesses the \p feature */
int Fl_Graphics_Driver::has_feature(driver_feature feature) { return 0; }
/**
Sets the current font, which is then used in various drawing routines.
You may call this outside a draw context if necessary to measure text,
for instance by calling fl_width(), fl_measure(), or fl_text_extents(),
but on X this will open the display.
The font is identified by a \p face and a \p size.
The size of the font is measured in pixels and not "points".
Lines should be spaced \p size pixels apart or more.
*/
void fl_font(Fl_Font face, Fl_Fontsize fsize) {
if (!fl_graphics_driver)
fl_open_display();
fl_graphics_driver->font(face, fsize);
}
/** see fl_font(Fl_Font, Fl_Fontsize) */
void Fl_Graphics_Driver::font(Fl_Font face, Fl_Fontsize fsize) {font_ = face; size_ = fsize;}