Changeset 413

Timestamp:

Nov 4, 2021, 4:26:28 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Mouse window move simulation under Linux was not reliable due to incorrect check for mouse coordinates change.

Files:

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

branches/highdpi/Packages/CevoComponents/DrawDlg.pas

@@ -128 +128 @@
 procedure TDrawDlg.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
   Y: Integer);
+var
+  MousePos1: TPoint;
+  MousePos2: TPoint;
 {$IFDEF LINUX}
-var
   MousePosNew: TPoint;
   NewFormPos: TPoint;
 {$ENDIF}
 begin
-  inherited;
+  MousePos1 := DpiMouse.CursorPos;
+  inherited;
+  MousePos2 := DpiMouse.CursorPos;
   {$IFDEF LINUX}
   // Only if client is not doing own mouse move handling
@@ -147 +151 @@
       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
+      if (MousePos1.X = MousePos2.X) and (MousePos1.Y = MousePos2.Y) then begin
         MoveActive := True;
       end;
@@ -193 +197 @@
   {$IFDEF LCLGTK2}
   // GTK2 bug workaround https://bugs.freepascal.org/view.php?id=35720
-  if Visible then LastMouse.WinControl := Self;
+  if Visible then LastMouse.WinControl := Self.GetNativeForm;
   {$ENDIF}
 end;

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -102 +102 @@
   else
   begin
-    Pos := Point(Integer(Msg.LParam and $ffff),
-      Integer((Msg.LParam shr 16) and $ffff));
+    Pos := Point(ScaleFromNative(Integer(Msg.LParam and $ffff)),
+      ScaleFromNative(Integer((Msg.LParam shr 16) and $ffff)));
     if Pos.Y >= Top + TitleHeight then
       Msg.Result := HTCLIENT
@@ -128 +128 @@
 procedure TDrawDlg.MouseDown(Button: TMouseButton; Shift: TShiftState; X,
   Y: Integer);
+var
+  MousePos1: TPoint;
+  MousePos2: TPoint;
 {$IFDEF LINUX}
-var
   MousePosNew: TPoint;
   NewFormPos: TPoint;
 {$ENDIF}
 begin
-  inherited;
+  MousePos1 := Mouse.CursorPos;
+  inherited;
+  MousePos2 := Mouse.CursorPos;
   {$IFDEF LINUX}
   // Only if client is not doing own mouse move handling
@@ -147 +151 @@
       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
+      if (MousePos1.X = MousePos2.X) and (MousePos1.Y = MousePos2.Y) then begin
         MoveActive := True;
       end;