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

Issue #438 : Wayland: Text drawing different from Xft version - cont'd.

Browse Source
This commit is contained in:
ManoloFLTK 2022-05-01 09:44:20 +02:00
parent cf1c8b1125
commit 71dedbc886
2 changed files with 9 additions and 4 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

@ -165,6 +165,7 @@ public:
void draw(const char* s, int nBytes, float x, float y); void draw(const char* s, int nBytes, float x, float y);
void draw(int angle, const char *str, int n, int x, int y); void draw(int angle, const char *str, int n, int x, int y);
void rtl_draw(const char* str, int n, int x, int y); void rtl_draw(const char* str, int n, int x, int y);
int height();
int descent(); int descent();
double width(const char *str, int n); double width(const char *str, int n);
double width(unsigned c); double width(unsigned c);

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

@ -915,6 +915,12 @@ void Fl_Cairo_Graphics_Driver::delete_bitmask(fl_uintptr_t bm) {
} }
int Fl_Cairo_Graphics_Driver::height() {
if (!font_descriptor()) font(0, 12);
return (font_descriptor()->ascent + font_descriptor()->descent) * 1.25;
}
int Fl_Cairo_Graphics_Driver::descent() { int Fl_Cairo_Graphics_Driver::descent() {
return font_descriptor()->descent; return font_descriptor()->descent;
} }
@ -1118,9 +1124,7 @@ void Fl_Cairo_Graphics_Driver::font(Fl_Font fnum, Fl_Fontsize s) {
void Fl_Cairo_Graphics_Driver::draw(const char* str, int n, float x, float y) { void Fl_Cairo_Graphics_Driver::draw(const char* str, int n, float x, float y) {
if (!n) return; if (!n) return;
cairo_save(cairo_); cairo_save(cairo_);
// The vertical offset size()/6. below vertically positions output text adequately cairo_translate(cairo_, x, y - size() - 1);
// relatively to the baseline (empirical observation).
cairo_translate(cairo_, x, y - height() + descent() - size()/6.);
pango_layout_set_text(pango_layout_, str, n); pango_layout_set_text(pango_layout_, str, n);
pango_cairo_show_layout(cairo_, pango_layout_); pango_cairo_show_layout(cairo_, pango_layout_);
cairo_restore(cairo_); cairo_restore(cairo_);
@ -1192,7 +1196,7 @@ void Fl_Cairo_Graphics_Driver::text_extents(const char* txt, int n, int& dx, int
PangoRectangle ink_rect; PangoRectangle ink_rect;
pango_layout_get_pixel_extents(pango_layout_, &ink_rect, NULL); pango_layout_get_pixel_extents(pango_layout_, &ink_rect, NULL);
dx = ink_rect.x; dx = ink_rect.x;
dy = ink_rect.y - height() + descent(); dy = ink_rect.y - size();
w = ink_rect.width; w = ink_rect.width;
h = ink_rect.height; h = ink_rect.height;
} }