Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-04-07 08:25:05 +08:00
commit 16fb84538a
36 changed files with 169 additions and 4181 deletions

View file

@ -718,6 +718,9 @@ public:
return mUserData.Get(key);
}
virtual cairo_scaled_font_t* GetCairoScaledFont() { return nullptr; }
virtual void SetCairoScaledFont(cairo_scaled_font_t* font) {}
protected:
ScaledFont() {}

View file

@ -48,8 +48,8 @@ public:
#ifdef USE_CAIRO_SCALED_FONT
bool PopulateCairoScaledFont();
cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; }
void SetCairoScaledFont(cairo_scaled_font_t* font);
virtual cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; }
virtual void SetCairoScaledFont(cairo_scaled_font_t* font);
#endif
protected: