diff options
Diffstat (limited to 'gfx/x11')
-rw-r--r-- | gfx/x11/fpgfxpackage.lpk | 2 | ||||
-rw-r--r-- | gfx/x11/gfx_x11.pas | 6 | ||||
-rw-r--r-- | gfx/x11/unitxft.pas | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/gfx/x11/fpgfxpackage.lpk b/gfx/x11/fpgfxpackage.lpk index 84608925..c58916a3 100644 --- a/gfx/x11/fpgfxpackage.lpk +++ b/gfx/x11/fpgfxpackage.lpk @@ -20,7 +20,7 @@ "/> <License Value="Modified LGPL "/> - <Version Minor="3"/> + <Version Minor="4"/> <Files Count="9"> <Item1> <Filename Value="../gfxbase.pas"/> diff --git a/gfx/x11/gfx_x11.pas b/gfx/x11/gfx_x11.pas index eb4c0eb5..1a9d2228 100644 --- a/gfx/x11/gfx_x11.pas +++ b/gfx/x11/gfx_x11.pas @@ -2128,11 +2128,7 @@ end; function TX11FontResourceImpl.GetHeight: integer; begin - {$IFDEF XftSupport} - Result := FFontData^.height; - {$ELSE} - Result := FFontData^.Ascent + FFontData^.Descent; - {$ENDIF} + Result := GetAscent + GetDescent; end; end. diff --git a/gfx/x11/unitxft.pas b/gfx/x11/unitxft.pas index 2ede5a10..10958261 100644 --- a/gfx/x11/unitxft.pas +++ b/gfx/x11/unitxft.pas @@ -57,7 +57,7 @@ type end; TXftColor = record - pixel : longword; + pixel : ptrint; color : TXRenderColor; end; |