From f0971416626f5b2b1e64a8c9bc86734e81a193e8 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Wed, 6 Jul 2022 10:18:40 +0200 Subject: Move member q_width from class Fl_Font_Descriptor to Fl_Quartz_Font_Descriptor. That's because this member is used only in Fl_Quartz_Font_Descriptor. --- src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx | 3 +-- src/drivers/Quartz/Fl_Font.H | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx index a8f5d90a2..669f9e813 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx @@ -1090,10 +1090,9 @@ Fl_Cairo_Font_Descriptor::Fl_Cairo_Font_Descriptor(const char* name, Fl_Fontsize #else line_height = (pango_font_metrics_get_ascent(metrics) + pango_font_metrics_get_descent(metrics)) * 1.025 + 0.5; #endif - q_width = 0; // useless; pango_font_metrics_unref(metrics); g_object_unref(fontset); -//fprintf(stderr, "[%s](%d) ascent=%d descent=%d q_width=%d\n", name, size, ascent, descent, q_width); +//fprintf(stderr, "[%s](%d) ascent=%d descent=%d\n", name, size, ascent, descent); } diff --git a/src/drivers/Quartz/Fl_Font.H b/src/drivers/Quartz/Fl_Font.H index 36f7e2543..5e24ce7c3 100644 --- a/src/drivers/Quartz/Fl_Font.H +++ b/src/drivers/Quartz/Fl_Font.H @@ -39,6 +39,7 @@ public: ATSUTextLayout layout; ATSUStyle style; # endif + short q_width; }; extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table -- cgit v1.2.3