Changeset 178 for branches/highdpi/Packages/CevoComponents/DrawDlg.pas

Timestamp:

Jun 23, 2019, 3:15:29 PM (5 years ago)

Author:

chronos

Message:

• Modified: Use DpiControls package for High DPI support.

File:

• branches/highdpi/Packages/CevoComponents/DrawDlg.pas (modified) (4 diffs)

branches/highdpi/Packages/CevoComponents/DrawDlg.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Forms, LCLIntf, LCLType, LMessages, Messages, Graphics,
-  Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools;
+  Controls, ButtonBase, ButtonA, ButtonB, Area, ScreenTools, UDpiControls;
 
 type
   { TDrawDlg }
 
-  TDrawDlg = class(TForm)
+  TDrawDlg = class(TDpiForm)
   public
     constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
     procedure SmartInvalidate; virtual;
-  private
-    MoveFormPos: TPoint;
-    MoveMousePos: TPoint;
-    MoveActive: Boolean;
-    procedure VisibleChangedHandler(Sender: TObject);
   protected
-    TitleHeight: Integer;
+    TitleHeight: integer;
     // defines area to grip the window for moving (from top)
     procedure InitButtons;
     procedure OnEraseBkgnd(var m: TMessage); message WM_ERASEBKGND;
     procedure OnHitTest(var Msg: TMessage); message WM_NCHITTEST;
-    procedure MouseDown(Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-      override;
-    procedure MouseMove(Shift: TShiftState; X, Y: Integer); override;
-    procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
-    procedure MouseLeave; override;
   end;
 
@@ -69 +58 @@
   inherited;
   TitleHeight := 0;
-  MoveActive := False;
-  AddHandlerOnVisibleChanged(VisibleChangedHandler);
-end;
-
-destructor TDrawDlg.Destroy;
-begin
-  RemoveHandlerOnVisibleChanging(VisibleChangedHandler);
-  inherited Destroy;
 end;
 
@@ -117 +98 @@
 end;
 
-procedure TDrawDlg.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
-  Y: Integer);
-var
-  MousePosNew: TPoint;
-  NewFormPos: TPoint;
-begin
-  inherited;
-  {$IFDEF LINUX}
-  // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
-  NewFormPos := ScreenToClient(Mouse.CursorPos);
-  if (NewFormPos.X >= 0) and (NewFormPos.X < Width) and
-    (NewFormPos.Y >= 0) and (NewFormPos.Y < Height) then begin
-    MoveMousePos := ClientToScreen(Point(X, Y));
-    MoveFormPos := Point(Left, Top);
-    MousePosNew := Mouse.CursorPos;
-    // Activate move only if mouse position was not changed during inherited call
-    if (MousePosNew.X = MoveMousePos.X) and (MousePosNew.Y = MoveMousePos.Y) then begin
-      MoveActive := True;
-    end;
-  end else MoveActive := False;
-  {$ENDIF}
-end;
-
-procedure TDrawDlg.MouseMove(Shift: TShiftState; X, Y: Integer);
-var
-  MousePos: TPoint;
-begin
-  inherited;
-  if MoveActive then begin
-    MousePos := ClientToScreen(Point(X, Y));
-    SetBounds(MoveFormPos.X + MousePos.X - MoveMousePos.X,
-      MoveFormPos.Y + MousePos.Y - MoveMousePos.Y,
-      Width, Height);
-  end;
-end;
-
-procedure TDrawDlg.MouseUp(Button: TMouseButton; Shift: TShiftState; X,
-  Y: Integer);
-begin
-  MoveActive := False;
-  inherited;
-end;
-
-procedure TDrawDlg.MouseLeave;
-begin
-  MoveActive := False;
-  inherited;
-end;
-
-procedure TDrawDlg.VisibleChangedHandler(Sender: TObject);
-begin
-  MoveActive := False;
-end;
-
 procedure TDrawDlg.InitButtons;
 var
@@ -230 +157 @@
 begin
   if csDesigning in ComponentState then Exit;
-  PaintBackground(self, 3 + Border, 3 + Border, ClientWidth - (6 + 2 * Border),
+  PaintBackground(Self, 3 + Border, 3 + Border, ClientWidth - (6 + 2 * Border),
     ClientHeight - (6 + 2 * Border));
   for i := 0 to Border do