diff options
| author | Graeme Geldenhuys <graemeg@users.sourceforge.net> | 2007-05-01 18:20:12 +0000 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@users.sourceforge.net> | 2007-05-01 18:20:12 +0000 |
| commit | ca38402b7cecfb29523181c100d429772bb25e00 (patch) | |
| tree | ddc4ea959f60b3c59232e17ba9a7285afc8dc719 /gfx | |
| parent | 55825e0ebbe83c960478600f37858fdb8df2cf82 (diff) | |
| download | fpGUI-ca38402b7cecfb29523181c100d429772bb25e00.tar.xz | |
* GUI: Implemented a very basic ShowMessag() function.
This is still work in progress!
* GUI: Implemented TFBoxLayout.RemoveChild
* GFX/X11: Fixed a issue with the TextExtent where the
lower curl of the character g will get clipped
* GUI: Implemented a basic TDBLabel component
* GUI Demos: Implemented a basic DB Test example. This is
still work in progress and only tested under Linux.
* GFX: Minor AMD64 fix for the unitxft.pas unit
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/gfxbase.pas | 3 | ||||
| -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 |
4 files changed, 5 insertions, 8 deletions
diff --git a/gfx/gfxbase.pas b/gfx/gfxbase.pas index ab4759ca..04212b2f 100644 --- a/gfx/gfxbase.pas +++ b/gfx/gfxbase.pas @@ -357,7 +357,8 @@ type function TextExtent(const AText: String): TSize; virtual; function TextWidth(const AText: String): Integer; virtual; procedure TextOut(const APosition: TPoint; const AText: String); - +// procedure TextRect(Rect: TRect; X, Y: Integer; const Text: WideString; TextFlags: Integer = 0); + // Bit block transfers procedure Copy(ASource: TFCustomCanvas; const ADestPos: TPoint); virtual; procedure CopyRect(ASource: TFCustomCanvas; const ASourceRect: TRect; const ADestPos: TPoint); 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; |