Change prototype of virtual Fl_Graphics_Driver::pango_font_description().

This commit is contained in:
ManoloFLTK
2022-07-20 08:37:21 +02:00
parent 536c32ee99
commit 4ae905cc9d
4 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -367,7 +367,7 @@ public:
virtual void overlay_rect(int x, int y, int w , int h); virtual void overlay_rect(int x, int y, int w , int h);
virtual float override_scale(); virtual float override_scale();
virtual void restore_scale(float); virtual void restore_scale(float);
virtual PangoFontDescription* pango_font_description(Fl_Font) { return NULL; } virtual PangoFontDescription* pango_font_description() { return NULL; }
virtual void antialias(int state); virtual void antialias(int state);
virtual int antialias(); virtual int antialias();
virtual void delete_bitmask(fl_uintptr_t bm); virtual void delete_bitmask(fl_uintptr_t bm);
+3 -2
View File
@@ -175,13 +175,14 @@ public:
double width(const char *str, int n); double width(const char *str, int n);
double width(unsigned c); double width(unsigned c);
void text_extents(const char* txt, int n, int& dx, int& dy, int& w, int& h); void text_extents(const char* txt, int n, int& dx, int& dy, int& w, int& h);
virtual PangoFontDescription* pango_font_description(Fl_Font /*fnum*/) { virtual PangoFontDescription* pango_font_description() {
return ((Fl_Cairo_Font_Descriptor*)font_descriptor())->fontref; return ((Fl_Cairo_Font_Descriptor*)font_descriptor())->fontref;
} }
static void init_built_in_fonts(); static void init_built_in_fonts();
virtual Fl_Font set_fonts(const char* pattern_name); virtual Fl_Font set_fonts(const char* pattern_name);
virtual const char *font_name(int num); virtual const char *font_name(int num);
virtual void font_name(int num, const char *name); virtual const char* get_font_name(Fl_Font fnum, int* ap); virtual void font_name(int num, const char *name);
virtual const char* get_font_name(Fl_Font fnum, int* ap);
virtual int get_font_sizes(Fl_Font fnum, int*& sizep); virtual int get_font_sizes(Fl_Font fnum, int*& sizep);
virtual Fl_Region XRectangleRegion(int x, int y, int w, int h); virtual Fl_Region XRectangleRegion(int x, int y, int w, int h);
virtual void XDestroyRegion(Fl_Region r); virtual void XDestroyRegion(Fl_Region r);
+1 -1
View File
@@ -1511,7 +1511,7 @@ void Fl_PostScript_Graphics_Driver::transformed_draw(const char* str, int n, dou
pango_context_ = pango_font_map_create_context(def_font_map); // 1.22 pango_context_ = pango_font_map_create_context(def_font_map); // 1.22
pango_layout_ = pango_layout_new(pango_context_); pango_layout_ = pango_layout_new(pango_context_);
} }
PangoFontDescription *pfd = Fl_Graphics_Driver::default_driver().pango_font_description(font()); PangoFontDescription *pfd = Fl_Graphics_Driver::default_driver().pango_font_description();
pango_layout_set_font_description(pango_layout_, pfd); pango_layout_set_font_description(pango_layout_, pfd);
int pwidth, pheight; int pwidth, pheight;
cairo_save(cairo_); cairo_save(cairo_);
+1 -1
View File
@@ -85,7 +85,7 @@ protected:
static PangoFontMap *pfmap_; static PangoFontMap *pfmap_;
static PangoLayout *playout_; static PangoLayout *playout_;
public: public:
virtual PangoFontDescription* pango_font_description(Fl_Font fnum) { return pfd_array[fnum]; } virtual PangoFontDescription* pango_font_description() { return pfd_array[font()]; }
private: private:
static PangoFontDescription **pfd_array; // one array element for each Fl_Font static PangoFontDescription **pfd_array; // one array element for each Fl_Font
static int pfd_array_length; static int pfd_array_length;