Changeset 22 for branches/overos/UWindow.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/UWindow.pas (modified) (16 diffs)

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;