Small improvement to newmultihandle

2 files changed, 18 insertions, 4 deletions

diff --git a/prototypes/newmultihandle/gui_edit.inc b/prototypes/newmultihandle/gui_edit.inc
index ab23f13d..3e3deb56 100644
--- a/prototypes/newmultihandle/gui_edit.inc
+++ b/prototypes/newmultihandle/gui_edit.inc
@@ -15,6 +15,7 @@ type
     procedure   EvFocusOut; override;

     procedure   EvKeyPressed(AKey: Word); override;

     procedure   EvKeyReleased(AKey: Word); override;

+    procedure   EvKeyChar(AKeyChar: Char); override;

     procedure   EvMousePressed(AButton: TMouseButton; const AMousePos: TPoint); override;

     procedure   EvMouseReleased(AButton: TMouseButton; const AMousePos: TPoint); override;

     procedure   EvPaint; override;

@@ -66,9 +67,18 @@ begin
   inherited EvKeyReleased(AKey);

 end;

 

+procedure TFEdit.EvKeyChar(AKeyChar: Char);

+begin

+  WriteLn('KeyChar');

+

+  FText := FText + AKeyChar;

+  

+  Invalidate;

+end;

+

 procedure TFEdit.EvMousePressed(AButton: TMouseButton; const AMousePos: TPoint);

 begin

-  inherited EvMousePressed(AButton, AMousePos);

+  Self.CaptureMouse;

 end;

 

 procedure TFEdit.EvMouseReleased(AButton: TMouseButton;

@@ -81,7 +91,7 @@ procedure TFEdit.EvPaint;
 begin

   { Draw the edit }

 

-  GFDefaultStyle.DrawEdit(Canvas, Bounds(0, 0, Width, Height));

+  GFDefaultStyle.DrawEdit(Canvas, Bounds(0, 0, Width, Height), FText);

 

   inherited EvPaint();

 end;

diff --git a/prototypes/newmultihandle/gui_style.inc b/prototypes/newmultihandle/gui_style.inc
index f6aa7de1..0c11bf0b 100644
--- a/prototypes/newmultihandle/gui_style.inc
+++ b/prototypes/newmultihandle/gui_style.inc
@@ -15,7 +15,7 @@ type
     procedure   DrawButtonFace(ACanvas: TFCustomCanvas; ARect: TRect; AFlags: TFButtonFlags); virtual;

     procedure   DrawControlFrame(ACanvas: TFCustomCanvas; ARect: TRect); virtual;

     procedure   DrawDirectionArrow(ACanvas: TFCustomCanvas; ARect: TRect; direction: Integer); virtual;

-    procedure   DrawEdit(ACanvas: TFCustomCanvas; ARect: TRect); virtual;

+    procedure   DrawEdit(ACanvas: TFCustomCanvas; ARect: TRect; AText: string); virtual;

   end;

 

 const

@@ -88,12 +88,16 @@ procedure TFStyle.DrawDirectionArrow(ACanvas: TFCustomCanvas; ARect: TRect; dire
 begin

 end;

 

-procedure TFStyle.DrawEdit(ACanvas: TFCustomCanvas; ARect: TRect);

+procedure TFStyle.DrawEdit(ACanvas: TFCustomCanvas; ARect: TRect; AText: string);

 begin

   { Inner area }

   ACanvas.SetColor(colWhite);

   ACanvas.FillRect(ARect);

 

+  { The text }

+  

+  ACanvas.TextOut(Point(5, 0), AText);

+

   { Outer border }

   ACanvas.SetColor(colGrayBlue);

   ACanvas.DrawRect(ARect);