diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2025-09-19 11:10:52 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2025-09-19 11:10:52 +0200 |
| commit | b7e52bb03cfd2d47249019de9c39cadcad18f547 (patch) | |
| tree | 0055b240f27d0fb2c849610a26432cd40b8d1c0d /src/drivers/GDI | |
| parent | 9b56da5753c21d223971d653dce413ee751d752d (diff) | |
Underline does not appear in some fonts and scales (Windows,X11-noCairo) (#1308)
Diffstat (limited to 'src/drivers/GDI')
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver.H | 1 | ||||
| -rw-r--r-- | src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H index f505619b6..336fa1ebc 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.H +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.H @@ -74,7 +74,6 @@ public: static HBITMAP calc_HBITMAP_mask(Fl_RGB_Image *mask); void delete_bitmask(fl_uintptr_t bm) FL_OVERRIDE; HBITMAP create_alphamask(int w, int h, int d, int ld, const uchar *array); - void draw(const char *str, int n, int x, int y) FL_OVERRIDE; void draw_unscaled(const char* str, int n, int x, int y) FL_OVERRIDE; void draw_unscaled(int angle, const char *str, int n, int x, int y) FL_OVERRIDE; void rtl_draw_unscaled(const char* str, int n, int x, int y) FL_OVERRIDE; diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx index 354957bb9..e901db971 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_font.cxx @@ -593,16 +593,6 @@ exit_error: return; } // fl_text_extents - -void Fl_GDI_Graphics_Driver::draw(const char *str, int n, int x, int y) { - if (!size_ || !font_descriptor()) font(FL_HELVETICA, FL_NORMAL_SIZE); - Fl_Region r2 = scale_clip(scale()); - int offset = (scale() == 1 ? 0 : -1); // for issue #1308 - draw_unscaled(str, n, floor(x), floor(y + offset)); - unscale_clip(r2); -} - - void Fl_GDI_Graphics_Driver::draw_unscaled(const char* str, int n, int x, int y) { COLORREF oldColor = SetTextColor(gc_, fl_RGB()); // avoid crash if no font has been set yet |