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

Move fl_font(face, size) to fl_draw.cxx

Browse Source 
I believe this is a better place.

Also: add FL_EXPORT since it's no longer inline.
This commit is contained in:
Albrecht Schlosser 2020-02-03 17:30:54 +01:00
parent dd3485c57a
commit 97554a88cc
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FL/fl_draw.H
View File

@ -576,9 +576,9 @@ FL_EXPORT void fl_rescale_offscreen(Fl_Offscreen &ctx);
// Fonts:
/*
Sets the current font, which is then used in various drawing routines.
Implemented and documented in src/Fl_Graphics_Driver.cxx
Implemented and documented in src/fl_draw.cxx
*/
void fl_font(Fl_Font face, Fl_Fontsize fsize);
FL_EXPORT 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,22 +557,6 @@ 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;}

23
src/fl_draw.cxx
View File

@ -3,17 +3,17 @@
//
// Label drawing code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2020 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
// file is missing or damaged, see the license at:
//
// http://www.fltk.org/COPYING.php
// https://www.fltk.org/COPYING.php
//
// Please report all bugs and problems on the following page:
//
// http://www.fltk.org/str.php
// https://www.fltk.org/str.php
//
// Implementation of fl_draw(const char*,int,int,int,int,Fl_Align)
@ -27,6 +27,7 @@
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/Fl_Image.H>
#include <FL/platform.H> // fl_open_display()
#include "flstring.h"
#include <ctype.h>
@ -419,6 +420,22 @@ void fl_measure(const char* str, int& w, int& h, int draw_symbols) {
h = lines*h;
}
/**
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);
}
/**
This function returns the actual height of the specified \p font
and \p size. Normally the font height should always be 'size',