Changeset 22 for branches/overos/UFormMain.pas

Timestamp:

Dec 30, 2018, 1:01:14 AM (5 years ago)

Author:

chronos

Message:

• Added: Close button to window title bar.

File:

• branches/overos/UFormMain.pas (modified) (7 diffs)

branches/overos/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UWindow, USystem, UTypes, UMouse, UGraphics, UControls;
+  Types, UWindow, USystem, UTypes, UMouse, UGraphics, UControls, UApplication;
 
 type
@@ -16 +16 @@
   TFormMain = class(TForm)
     Image1: TImage;
+    Timer1: TTimer;
     procedure Image1MouseDown(Sender: TObject; Button: TControlsMouseButton;
       Shift: TShiftState; X, Y: Integer);
@@ -23 +24 @@
     procedure FormResize(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure Timer1Timer(Sender: TObject);
   private
 
   public
+    App: TApplication;
     System: TSystem;
   end;
@@ -36 +39 @@
     procedure DrawArea(Rect: TRectangle; Color: TColor); override;
     procedure DrawText(P: TPosition; Color: TColor; Text: string); override;
+    function GetTextSize(Text: string): TSize; override;
   end;
 
@@ -66 +70 @@
 procedure TCanvasScreen.DrawText(P: TPosition; Color: TColor; Text: string);
 begin
+  Canvas.Brush.Style := bsClear;
   Canvas.Font.Color := Color;
   Canvas.TextOut(P.Left, P.Top, Text);
+end;
+
+function TCanvasScreen.GetTextSize(Text: string): TSize;
+var
+  Size: Types.TSize;
+begin
+  Size := Canvas.TextExtent(Text);
+  Result := TSize.Create(Size.cx, Size.cy);
 end;
 
@@ -125 +138 @@
   System.Screen.Size := TSize.Create(Width, Height);
 
+  App := TApplication.Create;
+
   Window := System.Screen.CreateWindow('Test');
+  Window.Application := App;
 
   Window := System.Screen.CreateWindow('Commander');
-  Window.Rectangle.Position := TPosition.Create(100, 50);
-  Window.Rectangle.Size := TSize.Create(400, 200);
+  Window.Position := TPosition.Create(100, 50);
+  Window.Size := TSize.Create(400, 200);
+  Window.Application := App;
   Button := TButton.Create;
   Button.Rectangle := TRectangle.Create(TPosition.Create(10, 50), TSize.Create(100, 32));
@@ -137 +154 @@
 
   Window := System.Screen.CreateWindow('Calculator');
-  Window.Rectangle.Position := TPosition.Create(200, 100);
-  Window.Rectangle.Size := TSize.Create(300, 200);
+  Window.Application := App;
+  Window.Position := TPosition.Create(200, 100);
+  Window.Size := TSize.Create(300, 200);
 
   System.Screen.Paint;
 end;
 
+procedure TFormMain.Timer1Timer(Sender: TObject);
+begin
+  App.ProcessMessages;
+end;
+
 end.