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

Timestamp:

May 21, 2020, 8:17:38 PM (4 years ago)

Author:

chronos

Message:

• Modified: Update from trunk rev 245.
• Modified: Vcl prefix/suffix changed to Native.

File:

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

branches/highdpi/Packages/CevoComponents/DrawDlg.pas

@@ -13 +13 @@
 
   TDrawDlg = class(TDpiForm)
-  public
-    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
-    procedure SmartInvalidate; virtual;
   private
     MoveFormPos: TPoint;
@@ -33 +29 @@
     procedure MouseUp(Button: TMouseButton; Shift: TShiftState; X, Y: Integer); override;
     procedure MouseLeave; override;
+  public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    procedure SmartInvalidate; virtual;
   end;
 
@@ -127 +127 @@
   inherited;
   {$IFDEF LINUX}
-  // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
-  NewFormPos := ScreenToClient(DpiMouse.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 := DpiMouse.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;
+  // Only if client is not doing own mouse move handling
+  if not Assigned(OnMouseDown) or not Assigned(OnMouseMove) or not Assigned(OnMouseUp) then begin
+    // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
+    NewFormPos := ScreenToClient(DpiMouse.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 := DpiMouse.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;
+  end;
   {$ENDIF}
 end;