Changeset 22

Timestamp:

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

Author:

chronos

Message:

• Added: Close button to window title bar.

Location:

branches/overos

Files:

• UApplication.pas (added)
• UControls.pas (modified) (12 diffs)
• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (7 diffs)
• UGraphics.pas (modified) (2 diffs)
• UTypes.pas (modified) (6 diffs)
• UWindow.pas (modified) (16 diffs)
• overos.lpi (modified) (4 diffs)
• overos.lpr (modified) (1 diff)

branches/overos/UControls.pas

@@ -14 +14 @@
   TControl = class
   private
+    FOnClick: TNotifyEvent;
     FParentControl: TControl;
+    FRectangle: TRectangle;
     FVisible: Boolean;
+    function GetPosition: TPosition;
+    function GetSize: TSize;
     procedure SetParentControl(AValue: TControl);
-    procedure SetVisible(AValue: Boolean);
+    procedure SetPosition(AValue: TPosition);
+    procedure SetSize(AValue: TSize);
+  protected
+    procedure SetRectangle(AValue: TRectangle); virtual;
+    procedure SetVisible(AValue: Boolean); virtual;
   public
     Canvas: TCanvas;
-    Rectangle: TRectangle;
     Controls: TFPGObjectList<TControl>;
     procedure MouseButtonDown(Pos: TPosition; Button: TMouseButton); virtual;
@@ -30 +37 @@
     property ParentControl: TControl read FParentControl write SetParentControl;
     property Visible: Boolean read FVisible write SetVisible;
+    property Position: TPosition read GetPosition write SetPosition;
+    property Size: TSize read GetSize write SetSize;
+    property Rectangle: TRectangle read FRectangle write SetRectangle;
+    property OnClick: TNotifyEvent read FOnClick write FOnClick;
   end;
 
@@ -39 +50 @@
     procedure DrawArea(Rect: TRectangle; Color: TColor); override;
     procedure DrawText(P: TPosition; Color: TColor; Text: string); override;
+    function GetTextSize(Text: string): TSize; override;
   end;
 
@@ -47 +59 @@
     FClicked: Boolean;
     FTitle: string;
-    procedure MouseButtonDown(Pos: TPosition; Button: TMouseButton); override;
-    procedure MouseButtonUp(Pos: TPosition; Button: TMouseButton); override;
     procedure SetClicked(AValue: Boolean);
     procedure SetTitle(AValue: string);
   public
+    procedure MouseButtonDown(Pos: TPosition; Button: TMouseButton); override;
+    procedure MouseButtonUp(Pos: TPosition; Button: TMouseButton); override;
     procedure Paint; override;
     property Clicked: Boolean read FClicked write SetClicked;
@@ -85 +97 @@
 procedure TCanvasControl.DrawLine(P1, P2: TPosition; Color: TColor);
 begin
-  Control.ParentControl.Canvas.DrawLine(P1 + Control.Rectangle.Position, P2 + Control.Rectangle.Position, Color);
+  if Assigned(Control) and Assigned(Control.ParentControl) then
+    Control.ParentControl.Canvas.DrawLine(P1 + Control.Rectangle.Position, P2 + Control.Rectangle.Position, Color);
 end;
 
 procedure TCanvasControl.DrawArea(Rect: TRectangle; Color: TColor);
 begin
-  Control.ParentControl.Canvas.DrawArea(TRectangle.Create(Rect.Position + Control.Rectangle.Position,
-    Rect.Size), Color);
+  if Assigned(Control) and Assigned(Control.ParentControl) then
+    Control.ParentControl.Canvas.DrawArea(TRectangle.Create(Rect.Position + Control.Rectangle.Position,
+      Rect.Size), Color);
 end;
 
 procedure TCanvasControl.DrawText(P: TPosition; Color: TColor; Text: string);
 begin
-  Control.ParentControl.Canvas.DrawText(P + Control.Rectangle.Position, Color, Text);
+  if Assigned(Control) and Assigned(Control.ParentControl) then
+    Control.ParentControl.Canvas.DrawText(P + Control.Rectangle.Position, Color, Text);
+end;
+
+function TCanvasControl.GetTextSize(Text: string): TSize;
+begin
+  if Assigned(Control) and Assigned(Control.ParentControl) then
+    Result := Control.ParentControl.Canvas.GetTextSize(Text);
 end;
 
@@ -105 +126 @@
   if FVisible = AValue then Exit;
   FVisible := AValue;
-  Paint;
+  if not FVisible then begin
+    if Assigned(ParentControl) then ParentControl.Paint;
+  end else Paint;
 end;
 
@@ -128 +151 @@
       Break;
     end;
+  if Assigned(FOnClick) then
+    FOnClick(Self);
 end;
 
@@ -151 +176 @@
 end;
 
+function TControl.GetPosition: TPosition;
+begin
+  Result := FRectangle.Position;
+end;
+
+function TControl.GetSize: TSize;
+begin
+  Result := FRectangle.Size;
+end;
+
+procedure TControl.SetPosition(AValue: TPosition);
+begin
+  Rectangle := TRectangle.Create(AValue, FRectangle.Size);
+end;
+
+procedure TControl.SetSize(AValue: TSize);
+begin
+  Rectangle := TRectangle.Create(FRectangle.Position, AValue);
+end;
+
+procedure TControl.SetRectangle(AValue: TRectangle);
+begin
+  if FRectangle = AValue then Exit;
+  FRectangle := AValue;
+end;
+
 procedure TControl.Paint;
 var
   I: Integer;
 begin
-  for I := 0 to Controls.Count - 1 do
-    Controls[I].Paint;
+  if FVisible then begin
+    for I := 0 to Controls.Count - 1 do
+      Controls[I].Paint;
+  end;
 end;
 
@@ -168 +221 @@
 
 destructor TControl.Destroy;
-begin
+var
+  I: Integer;
+begin
+  for I := 0 to Controls.Count - 1 do
+    Controls[I].Free;
+  ParentControl := nil;
   Canvas.Free;
   Controls.Free;
@@ -185 +243 @@
 procedure TEdit.Paint;
 begin
-  Canvas.DrawArea(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clBlack);
-  Canvas.DrawFrame(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clWhite);
-  Canvas.DrawText(TPosition.Create(4, 4), clWhite, FText);
+  if FVisible then begin
+    Canvas.DrawArea(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clBlack);
+    Canvas.DrawFrame(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clWhite);
+    Canvas.DrawText(TPosition.Create(4, 4), clWhite, FText);
+  end;
   inherited;
 end;
@@ -202 +262 @@
 procedure TLabel.Paint;
 begin
-  Canvas.DrawText(TPosition.Create(0, 0), clWhite, FTitle);
+  if FVisible then begin
+    Canvas.DrawText(TPosition.Create(0, 0), clWhite, FTitle);
+  end;
   inherited;
 end;
@@ -237 +299 @@
 var
   Color: TColor;
-begin
-  if Clicked then Color := clBlack
-    else Color := clGray;
-  Canvas.DrawArea(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), Color);
-  Canvas.DrawFrame(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clWhite);
-  Canvas.DrawText(TPosition.Create(8, 8), clWhite, FTitle);
+  TextSize: TSize;
+begin
+  if FVisible then begin
+    if Clicked then Color := clBlack
+      else Color := clGray;
+    Canvas.DrawArea(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), Color);
+    Canvas.DrawFrame(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clWhite);
+    TextSize := Canvas.GetTextSize(FTitle);
+    Canvas.DrawText(TPosition.Create((Size.Width - TextSize.Width) div 2,
+      (Size.Height - TextSize.Height) div 2), clWhite, FTitle);
+  end;
   inherited;
 end;

branches/overos/UFormMain.lfm

@@ -21 +21 @@
     OnMouseUp = Image1MouseUp
   end
+  object Timer1: TTimer
+    Interval = 10
+    OnTimer = Timer1Timer
+    left = 303
+    top = 201
+  end
 end

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.
 

branches/overos/UGraphics.pas

@@ -18 +18 @@
     procedure DrawArea(Rect: TRectangle; Color: TColor); virtual;
     procedure DrawText(P: TPosition; Color: TColor; Text: string); virtual;
+    function GetTextSize(Text: string): TSize; virtual;
   end;
 
@@ -51 +52 @@
 end;
 
+function TCanvas.GetTextSize(Text: string): TSize;
+begin
+  Result := TSize.Create(0, 0);
+end;
+
 
 end.

branches/overos/UTypes.pas

@@ -18 +18 @@
     class operator Add(A, B: TSize): TSize;
     class operator Subtract(A, B: TSize): TSize;
+    class operator Equal(A, B: TSize): Boolean;
   end;
 
@@ -28 +29 @@
     class operator Add(A, B: TPosition): TPosition;
     class operator Subtract(A, B: TPosition): TPosition;
+    class operator Equal(A, B: TPosition): Boolean;
   end;
 
@@ -37 +39 @@
     function Create(Position: TPosition; Size: TSize): TRectangle;
     function Contains(Position: TPosition): Boolean;
+    class operator Equal(A, B: TRectangle): Boolean;
+  end;
+
+  TMessage = class
+    Handle: TObject;
   end;
 
@@ -56 +63 @@
     (Self.Position.Left + Self.Size.Width >= Position.Left) and
     (Self.Position.Top + Self.Size.Height >= Position.Top);
+end;
+
+class operator TRectangle.Equal(A, B: TRectangle): Boolean;
+begin
+  Result := (A.Position = B.Position) and (A.Size = B.Size);
 end;
 
@@ -78 +90 @@
 end;
 
+class operator TPosition.Equal(A, B: TPosition): Boolean;
+begin
+  Result := (A.Left = B.Left) and (A.Top = B.Top);
+end;
+
 { TSize }
 
@@ -98 +115 @@
 end;
 
+class operator TSize.Equal(A, B: TSize): Boolean;
+begin
+  Result := (A.Width = B.Width) and (A.Height = B.Height);
+end;
+
 
 end.

branches/overos/UWindow.pas

@@ -19 +19 @@
     procedure DrawArea(Rect: TRectangle; Color: TColor); override;
     procedure DrawText(P: TPosition; Color: TColor; Text: string); override;
+    function GetTextSize(Text: string): TSize; override;
   end;
 
   TWindowSide = (wsNone, wsLeft, wsTop, wsRight, wsBottom);
 
-  { TWindow }
-
-  TWindow = class(TControl)
+  { TTitleBar }
+
+  TTitleBar = class(TControl)
+  private
+    FWindow: TWindow;
+    procedure SetWindow(AValue: TWindow);
+    procedure ButtonCloseClick(Sender: TObject);
+    procedure ButtonMaximizeClick(Sender: TObject);
+    procedure ButtonMinimizeClick(Sender: TObject);
+  protected
+    procedure SetRectangle(AValue: TRectangle); override;
   public
   const
     TitleHeight = 32;
+  var
+    ButtonClose: TButton;
+    ButtonMaximize: TButton;
+    ButtonMinimize: TButton;
+    constructor Create; override;
+    destructor Destroy; override;
+    property Window: TWindow read FWindow write SetWindow;
+  end;
+
+  TMessageWindowClose = class(TMessage);
+
+  { TWindow }
+
+  TWindow = class(TControl)
+  private
+    FScreen: TScreen;
+    procedure SetScreen(AValue: TScreen);
+  protected
+    procedure SetRectangle(AValue: TRectangle); override;
+    procedure SetVisible(AValue: Boolean); override;
+  public
+  const
     BorderGrabWidth = 15;
   var
+    TitleBar: TTitleBar;
     Title: string;
-    Screen: TScreen;
+    Application: TObject; // TApplication
+    procedure MouseButtonDown(Pos: TPosition; Button: TMouseButton); override;
+    procedure MouseButtonUp(Pos: TPosition; Button: TMouseButton); override;
+    procedure Close;
     procedure Focus;
     procedure Paint; override;
@@ -38 +73 @@
     constructor Create; override;
     destructor Destroy; override;
+    property Screen: TScreen read FScreen write SetScreen;
   end;
 
@@ -68 +104 @@
 implementation
 
+uses
+  UApplication;
+
+{ TTitleBar }
+
+procedure TTitleBar.SetWindow(AValue: TWindow);
+begin
+  if FWindow = AValue then Exit;
+  Canvas.Free;
+  FWindow := AValue;
+  Canvas := TCanvasWindow.Create;
+  TCanvasWindow(Canvas).Window := FWindow;
+end;
+
+procedure TTitleBar.ButtonCloseClick(Sender: TObject);
+begin
+  Window.Close;
+end;
+
+procedure TTitleBar.ButtonMaximizeClick(Sender: TObject);
+begin
+  Rectangle := TRectangle.Create(TPosition.Create(0, 0), Window.Screen.Size);
+  Paint;
+end;
+
+procedure TTitleBar.ButtonMinimizeClick(Sender: TObject);
+begin
+
+end;
+
+procedure TTitleBar.SetRectangle(AValue: TRectangle);
+begin
+  inherited;
+  ButtonClose.Rectangle := TRectangle.Create(TPosition.Create(Size.Width - TitleHeight, 4),
+    TSize.Create(TitleHeight - 8, TitleHeight - 8));
+  ButtonMaximize.Rectangle := TRectangle.Create(TPosition.Create(Size.Width - 2 * TitleHeight, 4),
+    TSize.Create(TitleHeight - 8, TitleHeight - 8));
+  ButtonMinimize.Rectangle := TRectangle.Create(TPosition.Create(Size.Width - 3 * TitleHeight, 4),
+    TSize.Create(TitleHeight - 8, TitleHeight - 8));
+end;
+
+constructor TTitleBar.Create;
+begin
+  inherited;
+
+  ButtonClose := TButton.Create;
+  ButtonClose.Title := 'X';
+  ButtonClose.ParentControl := Self;
+  ButtonClose.OnClick := ButtonCloseClick;
+  ButtonClose.Visible := True;
+
+  ButtonMaximize := TButton.Create;
+  ButtonMaximize.Title := '^';
+  ButtonMaximize.ParentControl := Self;
+  ButtonMaximize.OnClick := ButtonMaximizeClick;
+  ButtonMaximize.Visible := True;
+
+  ButtonMinimize := TButton.Create;
+  ButtonMinimize.Title := '_';
+  ButtonMinimize.ParentControl := Self;
+  ButtonMinimize.OnClick := ButtonMinimizeClick;
+  ButtonMinimize.Visible := True;
+end;
+
+destructor TTitleBar.Destroy;
+begin
+  ButtonClose.Free;
+  ButtonMaximize.Free;
+  ButtonMinimize.Free;
+  inherited Destroy;
+end;
+
 { TCanvasWindow }
 
 procedure TCanvasWindow.DrawLine(P1, P2: TPosition; Color: TColor);
 begin
-  Window.Screen.Canvas.DrawLine(P1 + Window.Rectangle.Position, P2 + Window.Rectangle.Position, Color);
+  if Assigned(Window) and Assigned(Window.Screen) then
+    Window.Screen.Canvas.DrawLine(P1 + Window.Position, P2 + Window.Position, Color);
 end;
 
 procedure TCanvasWindow.DrawArea(Rect: TRectangle; Color: TColor);
 begin
-  Window.Screen.Canvas.DrawArea(TRectangle.Create(Rect.Position + Window.Rectangle.Position,
-    Rect.Size), Color);
+  if Assigned(Window) and Assigned(Window.Screen) then
+    Window.Screen.Canvas.DrawArea(TRectangle.Create(Rect.Position + Window.Position,
+      Rect.Size), Color);
 end;
 
 procedure TCanvasWindow.DrawText(P: TPosition; Color: TColor; Text: string);
 begin
-  Window.Screen.Canvas.DrawText(P + Window.Rectangle.Position, Color, Text);
+  if Assigned(Window) and Assigned(Window.Screen) then
+    Window.Screen.Canvas.DrawText(P + Window.Position, Color, Text);
+end;
+
+function TCanvasWindow.GetTextSize(Text: string): TSize;
+begin
+  if Assigned(Window) and Assigned(Window.Screen) then
+    Result := Window.Screen.Canvas.GetTextSize(Text);
 end;
 
 { TWindow }
+
+procedure TWindow.SetScreen(AValue: TScreen);
+begin
+  if FScreen = AValue then Exit;
+  if Assigned(FScreen) then
+    FScreen.Windows.Remove(Self);
+  FScreen := AValue;
+  if Assigned(FScreen) then
+    FScreen.Windows.Add(Self);
+end;
+
+procedure TWindow.SetRectangle(AValue: TRectangle);
+begin
+  inherited;
+  TitleBar.Rectangle := TRectangle.Create(Position, TSize.Create(Size.Width, TitleBar.TitleHeight));
+end;
+
+procedure TWindow.SetVisible(AValue: Boolean);
+begin
+  inherited;
+  if not Visible and Assigned(Screen) then
+    Screen.Paint;
+end;
+
+procedure TWindow.MouseButtonDown(Pos: TPosition; Button: TMouseButton);
+begin
+  inherited;
+  TitleBar.MouseButtonDown(Pos, Button);
+end;
+
+procedure TWindow.MouseButtonUp(Pos: TPosition; Button: TMouseButton);
+begin
+  inherited;
+  TitleBar.MouseButtonUp(Pos, Button);
+end;
+
+procedure TWindow.Close;
+begin
+  TApplication(Application).MessageQueue.PostMessage(Self, TMessageWindowClose.Create);
+end;
 
 procedure TWindow.Focus;
@@ -98 +255 @@
 procedure TWindow.Paint;
 begin
-  Canvas.DrawArea(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clGray);
-  Canvas.DrawFrame(TRectangle.Create(TPosition.Create(0, 0), Rectangle.Size), clWhite);
-  Canvas.DrawLine(TPosition.Create(0, TitleHeight),
-    TPosition.Create(Rectangle.Size.Width, TitleHeight), clWhite);
-  Canvas.DrawText(TPosition.Create(8, 4), clWhite, Title);
+  if Visible then begin
+    Canvas.DrawArea(TRectangle.Create(TPosition.Create(0, 0), Size), clGray);
+    Canvas.DrawFrame(TRectangle.Create(TPosition.Create(0, 0), Size), clWhite);
+    Canvas.DrawLine(TPosition.Create(0, TitleBar.TitleHeight),
+      TPosition.Create(Size.Width, TitleBar.TitleHeight), clWhite);
+    Canvas.DrawText(TPosition.Create(8, 4), clWhite, Title);
+    TitleBar.Paint;
+  end;
   inherited;
 end;
@@ -117 +277 @@
   Canvas := TCanvasWindow.Create;
   TCanvasWindow(Canvas).Window := Self;
+  TitleBar := TTitleBar.Create;
+  TitleBar.Window := Self;
+  TitleBar.Visible := True;
 end;
 
 destructor TWindow.Destroy;
 begin
+  Visible := False;
+  TitleBar.Free;
+  Screen := nil;
   inherited Destroy;
 end;
@@ -133 +299 @@
   for I := Windows.Count - 1 downto 0 do begin
     Window := Windows[I];
-    if TRectangle.Create(Window.Rectangle.Position - TPosition.Create(Window.BorderGrabWidth div 2, 0),
-    TSize.Create(Window.BorderGrabWidth, Window.Rectangle.Size.Height)).Contains(Pos) then begin
+    if TRectangle.Create(Window.Position - TPosition.Create(Window.BorderGrabWidth div 2, 0),
+    TSize.Create(Window.BorderGrabWidth, Window.Size.Height)).Contains(Pos) then begin
       GrabMousePosition := Pos;
       GrabWindowRectangle := Window.Rectangle;
@@ -141 +307 @@
       GrabActive := True;
     end else
-    if TRectangle.Create(Window.Rectangle.Position - TPosition.Create(0, Window.BorderGrabWidth div 2),
-    TSize.Create(Window.Rectangle.Size.Width, Window.BorderGrabWidth)).Contains(Pos) then begin
+    if TRectangle.Create(Window.Position - TPosition.Create(0, Window.BorderGrabWidth div 2),
+    TSize.Create(Window.Size.Width, Window.BorderGrabWidth)).Contains(Pos) then begin
       GrabMousePosition := Pos;
       GrabWindowRectangle := Window.Rectangle;
@@ -149 +315 @@
       GrabActive := True;
     end else
-    if TRectangle.Create(Window.Rectangle.Position + TPosition.Create(Window.Rectangle.Size.Width, 0) - TPosition.Create(Window.BorderGrabWidth div 2, 0),
-    TSize.Create(Window.BorderGrabWidth, Window.Rectangle.Size.Height)).Contains(Pos) then begin
+    if TRectangle.Create(Window.Position + TPosition.Create(Window.Size.Width, 0) - TPosition.Create(Window.BorderGrabWidth div 2, 0),
+    TSize.Create(Window.BorderGrabWidth, Window.Size.Height)).Contains(Pos) then begin
       GrabMousePosition := Pos;
       GrabWindowRectangle := Window.Rectangle;
@@ -157 +323 @@
       GrabActive := True;
     end else
-    if TRectangle.Create(Window.Rectangle.Position + TPosition.Create(0, Window.Rectangle.Size.Height) - TPosition.Create(0, Window.BorderGrabWidth div 2),
-    TSize.Create(Window.Rectangle.Size.Width, Window.BorderGrabWidth)).Contains(Pos) then begin
+    if TRectangle.Create(Window.Position + TPosition.Create(0, Window.Size.Height) - TPosition.Create(0, Window.BorderGrabWidth div 2),
+    TSize.Create(Window.Size.Width, Window.BorderGrabWidth)).Contains(Pos) then begin
       GrabMousePosition := Pos;
       GrabWindowRectangle := Window.Rectangle;
@@ -165 +331 @@
       GrabActive := True;
     end else
-    if TRectangle.Create(Window.Rectangle.Position, TSize.Create(Window.Rectangle.Size.Width, Window.TitleHeight)).Contains(Pos) then begin
+    if TRectangle.Create(Window.Position, TSize.Create(Window.Size.Width, Window.TitleBar.TitleHeight)).Contains(Pos) then begin
       GrabMousePosition := Pos;
       GrabWindowRectangle := Window.Rectangle;
@@ -174 +340 @@
     if Window.Rectangle.Contains(Pos) then begin
       Window.Focus;
-      Window.MouseButtonDown(Pos - Window.Rectangle.Position, Button);
+      Window.MouseButtonDown(Pos - Window.Position, Button);
       Break;
     end;
@@ -192 +358 @@
     Window := Windows[I];
     if Window.Rectangle.Contains(Pos) then begin
-      Window.MouseButtonUp(Pos - Window.Rectangle.Position, Button);
+      Window.MouseButtonUp(Pos - Window.Position, Button);
       Break;
     end;
@@ -204 +370 @@
   if GrabActive then begin
     if GrabWindowSide = wsNone then
-      GrabWindow.Rectangle.Position := GrabWindowRectangle.Position + (Pos - GrabMousePosition)
+      GrabWindow.Position := GrabWindowRectangle.Position + (Pos - GrabMousePosition)
     else if GrabWindowSide = wsLeft then
       GrabWindow.Rectangle := TRectangle.Create(GrabWindowRectangle.Position + TPosition.Create(Pos.Left - GrabMousePosition.Left, 0),
@@ -221 +387 @@
   for I := Windows.Count - 1 downto 0 do begin
     if Windows[I].Rectangle.Contains(Pos) then begin
-      Windows[I].MouseMove(Pos - Windows[I].Rectangle.Position);
+      Windows[I].MouseMove(Pos - Windows[I].Position);
       Break;
     end;
@@ -255 +421 @@
 begin
   Result := TWindow.Create;
-  Windows.Add(Result);
   Result.Screen := Self;
   Result.Title := Title;
@@ -265 +430 @@
 begin
   Windows := TFPGObjectList<TWindow>.Create;
+  Windows.FreeObjects := False;
   Canvas := TCanvas.Create;
 end;
 
 destructor TScreen.Destroy;
-begin
+var
+  I: Integer;
+begin
+  for I := 0 to Windows.Count - 1 do
+    Windows[I].Free;
   Windows.Free;
   Canvas.Free;

branches/overos/overos.lpi

@@ -11 +11 @@
       <Icon Value="0"/>
     </General>
-    <BuildModes Count="1">
-      <Item1 Name="Default" Default="True"/>
+    <BuildModes Count="2">
+      <Item1 Name="Debug" Default="True"/>
+      <Item2 Name="Release">
+        <CompilerOptions>
+          <Version Value="11"/>
+          <Target>
+            <Filename Value="overos"/>
+          </Target>
+          <SearchPaths>
+            <IncludeFiles Value="$(ProjOutDir)"/>
+            <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
+          </SearchPaths>
+          <Parsing>
+            <SyntaxOptions>
+              <SyntaxMode Value="Delphi"/>
+              <CStyleOperator Value="False"/>
+              <AllowLabel Value="False"/>
+              <CPPInline Value="False"/>
+            </SyntaxOptions>
+          </Parsing>
+          <CodeGeneration>
+            <SmartLinkUnit Value="True"/>
+            <Optimizations>
+              <OptimizationLevel Value="3"/>
+            </Optimizations>
+          </CodeGeneration>
+          <Linking>
+            <Debugging>
+              <GenerateDebugInfo Value="False"/>
+            </Debugging>
+            <LinkSmart Value="True"/>
+            <Options>
+              <Win32>
+                <GraphicApplication Value="True"/>
+              </Win32>
+            </Options>
+          </Linking>
+        </CompilerOptions>
+      </Item2>
     </BuildModes>
     <PublishOptions>
@@ -27 +64 @@
       </Item1>
     </RequiredPackages>
-    <Units Count="8">
+    <Units Count="9">
       <Unit0>
         <Filename Value="overos.lpr"/>
@@ -63 +100 @@
         <IsPartOfProject Value="True"/>
       </Unit7>
+      <Unit8>
+        <Filename Value="UApplication.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit8>
     </Units>
   </ProjectOptions>
@@ -72 +113 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <SyntaxMode Value="Delphi"/>
+        <CStyleOperator Value="False"/>
+        <IncludeAssertionCode Value="True"/>
+        <AllowLabel Value="False"/>
+        <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
+    <CodeGeneration>
+      <Checks>
+        <IOChecks Value="True"/>
+        <RangeChecks Value="True"/>
+        <OverflowChecks Value="True"/>
+        <StackChecks Value="True"/>
+      </Checks>
+      <VerifyObjMethodCallValidity Value="True"/>
+    </CodeGeneration>
     <Linking>
+      <Debugging>
+        <UseHeaptrc Value="True"/>
+      </Debugging>
       <Options>
         <Win32>

branches/overos/overos.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UWindow, UMouse, USystem, UTypes, UControls, UGraphics
+  Forms, UFormMain, UWindow, UMouse, USystem, UTypes, UControls, UGraphics,
+  UApplication
   { you can add units after this };