luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Apply Paint.FontScale only when Paint.Font is assigned. Not when one of the Paint.Font properties changes.

Browse source 
[GB.QT4]
* BUG: Apply Paint.FontScale only when Paint.Font is assigned. Not when one of the Paint.Font properties changes.

[GB.QT5]
* BUG: Apply Paint.FontScale only when Paint.Font is assigned. Not when one of the Paint.Font properties changes.
This commit is contained in:
gambas 2019-10-19 00:37:17 +02:00
parent fe2deabfbd
commit 8a0c190b95
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gb.qt4/src/cpaint_impl.cpp
View file

@ -377,9 +377,6 @@ static void apply_font(QFont &font, void *object = 0)
GB_PAINT *d = (GB_PAINT *)DRAW.Paint.GetCurrent();
QFont f = font;
if (d->fontScale != 1)
f.setPointSizeF(f.pointSizeF() * d->fontScale);
PAINTER(d)->setFont(f);
// Strange bug of QT. Sometimes the font does not apply (cf. DrawTextShadow)
if (f != PAINTER(d)->font())
@ -400,6 +397,9 @@ static void Font(GB_PAINT *d, int set, GB_FONT *font)
else if ((GB.Is(d->device, CLASS_DrawingArea)))
f = (((CWIDGET *)d->device)->widget)->font();
if (d->fontScale != 1)
f.setPointSizeF(f.pointSizeF() * d->fontScale);
apply_font(f);
/*PAINTER(d)->setFont(f);