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

Fixing set_font and image overflow for Cairo.

Browse Source
This commit is contained in:
Matthias Melcher 2024-08-31 23:20:27 +02:00
parent d51046cdea
commit 634ce805e5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
View File

@ -49,6 +49,7 @@ protected:
cairo_t *cairo_; cairo_t *cairo_;
PangoContext *pango_context_; PangoContext *pango_context_;
PangoLayout *pango_layout_; PangoLayout *pango_layout_;
static Fl_Font font_count_;
public: public:
Fl_Cairo_Graphics_Driver(); Fl_Cairo_Graphics_Driver();
~Fl_Cairo_Graphics_Driver() FL_OVERRIDE; ~Fl_Cairo_Graphics_Driver() FL_OVERRIDE;

11
src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
View File

@ -64,6 +64,9 @@ static Fl_Fontdesc built_in_table[] = {
FL_EXPORT Fl_Fontdesc *fl_fonts = built_in_table; FL_EXPORT Fl_Fontdesc *fl_fonts = built_in_table;
// Number of fonts found by Fl::set_fonts(char*) beyond FL_FREE_FONT
// -1 denotes "not yet initialised"
Fl_Font Fl_Cairo_Graphics_Driver::font_count_ = -1;
// duplicated from Fl_PostScript.cxx // duplicated from Fl_PostScript.cxx
struct callback_data { struct callback_data {
@ -799,7 +802,7 @@ void Fl_Cairo_Graphics_Driver::draw_cached_pattern_(Fl_Image *img, cairo_pattern
cairo_save(cairo_); cairo_save(cairo_);
bool need_extend = (cache_w != Ws || cache_h != Hs || (W >= 2 && H >= 2)); bool need_extend = (cache_w != Ws || cache_h != Hs || (W >= 2 && H >= 2));
if (need_extend || cx || cy || W < img->w() || H < img->h()) { // clip when necessary if (need_extend || cx || cy || W < img->w() || H < img->h()) { // clip when necessary
cairo_rectangle(cairo_, X - 0.5, Y - 0.5, W + 0.5, H + 0.5); cairo_rectangle(cairo_, X - 0.5, Y - 0.5, W, H);
cairo_clip(cairo_); cairo_clip(cairo_);
} }
// remove any scaling and the current "0.5" translation useful for lines but bad for images // remove any scaling and the current "0.5" translation useful for lines but bad for images
@ -811,7 +814,7 @@ void Fl_Cairo_Graphics_Driver::draw_cached_pattern_(Fl_Image *img, cairo_pattern
bool condition = Fl_RGB_Image::scaling_algorithm() == FL_RGB_SCALING_BILINEAR && bool condition = Fl_RGB_Image::scaling_algorithm() == FL_RGB_SCALING_BILINEAR &&
(fabs(Ws/float(cache_w) - 1) > 0.02 || fabs(Hs/float(cache_h) - 1) > 0.02); (fabs(Ws/float(cache_w) - 1) > 0.02 || fabs(Hs/float(cache_h) - 1) > 0.02);
cairo_pattern_set_filter(pat, condition ? CAIRO_FILTER_GOOD : CAIRO_FILTER_FAST); cairo_pattern_set_filter(pat, condition ? CAIRO_FILTER_GOOD : CAIRO_FILTER_FAST);
cairo_pattern_set_extend(pat, CAIRO_EXTEND_PAD); cairo_pattern_set_extend(pat, CAIRO_EXTEND_NONE);
} }
cairo_matrix_init_scale(&matrix, double(cache_w)/Ws, double(cache_h)/Hs); cairo_matrix_init_scale(&matrix, double(cache_w)/Ws, double(cache_h)/Hs);
cairo_matrix_translate(&matrix, -Xs , -Ys ); cairo_matrix_translate(&matrix, -Xs , -Ys );
@ -1103,6 +1106,9 @@ static int font_sort(Fl_Fontdesc *fa, Fl_Fontdesc *fb) {
Fl_Font Fl_Cairo_Graphics_Driver::set_fonts(const char* /*pattern_name*/) Fl_Font Fl_Cairo_Graphics_Driver::set_fonts(const char* /*pattern_name*/)
{ {
// Return immideatly if the fonts were already counted
if (font_count_ != -1)
return FL_FREE_FONT + font_count_;
fl_open_display(); fl_open_display();
int n_families, count = 0; int n_families, count = 0;
PangoFontFamily **families; PangoFontFamily **families;
@ -1147,6 +1153,7 @@ Fl_Font Fl_Cairo_Graphics_Driver::set_fonts(const char* /*pattern_name*/)
} }
// Sort the list into alphabetic order // Sort the list into alphabetic order
qsort(fl_fonts + FL_FREE_FONT, count, sizeof(Fl_Fontdesc), (sort_f_type)font_sort); qsort(fl_fonts + FL_FREE_FONT, count, sizeof(Fl_Fontdesc), (sort_f_type)font_sort);
font_count_ = count;
return FL_FREE_FONT + count; return FL_FREE_FONT + count;
} }