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

Fix: fl_height(int, int) decreases the font size after each call (#915)

Browse Source
This commit is contained in:
ManoloFLTK
2024-02-21 09:38:24 +01:00
parent 681e22a452
commit 957becbe28
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Graphics_Driver.H
+1
View File
@@ -410,6 +410,7 @@ struct Fl_Fontdesc {
In the future, it may also be used by other platforms. In the future, it may also be used by other platforms.
*/ */
class FL_EXPORT Fl_Scalable_Graphics_Driver : public Fl_Graphics_Driver { class FL_EXPORT Fl_Scalable_Graphics_Driver : public Fl_Graphics_Driver {
Fl_Fontsize fontsize_; // scale-independent font size value
public: public:
Fl_Scalable_Graphics_Driver(); Fl_Scalable_Graphics_Driver();
// This function aims to compute accurately int(x * s) in // This function aims to compute accurately int(x * s) in
src/Fl_Graphics_Driver.cxx
+3 -1
View File
@@ -745,6 +745,7 @@ Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize Size) {
Fl_Scalable_Graphics_Driver::Fl_Scalable_Graphics_Driver() : Fl_Graphics_Driver() { Fl_Scalable_Graphics_Driver::Fl_Scalable_Graphics_Driver() : Fl_Graphics_Driver() {
line_width_ = 0; line_width_ = 0;
fontsize_ = -1;
} }
void Fl_Scalable_Graphics_Driver::rect(int x, int y, int w, int h) void Fl_Scalable_Graphics_Driver::rect(int x, int y, int w, int h)
@@ -862,6 +863,7 @@ void Fl_Scalable_Graphics_Driver::circle(double x, double y, double r) {
void Fl_Scalable_Graphics_Driver::font(Fl_Font face, Fl_Fontsize size) { void Fl_Scalable_Graphics_Driver::font(Fl_Font face, Fl_Fontsize size) {
if (!font_descriptor()) fl_open_display(); // to catch the correct initial value of scale_ if (!font_descriptor()) fl_open_display(); // to catch the correct initial value of scale_
font_unscaled(face, Fl_Fontsize(size * scale())); font_unscaled(face, Fl_Fontsize(size * scale()));
fontsize_ = size;
} }
Fl_Font Fl_Scalable_Graphics_Driver::font() { Fl_Font Fl_Scalable_Graphics_Driver::font() {
@@ -878,7 +880,7 @@ double Fl_Scalable_Graphics_Driver::width(unsigned int c) {
Fl_Fontsize Fl_Scalable_Graphics_Driver::size() { Fl_Fontsize Fl_Scalable_Graphics_Driver::size() {
if (!font_descriptor() ) return -1; if (!font_descriptor() ) return -1;
return Fl_Fontsize(size_unscaled()/scale()); return fontsize_;
} }
void Fl_Scalable_Graphics_Driver::text_extents(const char *str, int n, int &dx, int &dy, int &w, int &h) { void Fl_Scalable_Graphics_Driver::text_extents(const char *str, int n, int &dx, int &dy, int &w, int &h) {