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

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;