Changeset 174

Timestamp:

Jun 16, 2019, 11:29:21 AM (5 years ago)

Author:

chronos

Message:

• Fixed: Disable MoveAction for TDrawDlg instances after visible change.

Location:

trunk

Files:

• LocalPlayer/Nego.pas (modified) (1 diff)
• Packages/CevoComponents/DrawDlg.pas (modified) (5 diffs)
• Packages/CevoComponents/Sound.pas (modified) (1 diff)
• Packages/CevoComponents/StringTables.pas (modified) (2 diffs)

trunk/LocalPlayer/Nego.pas

@@ -15 +15 @@
 type
   THistory = record
-    n: integer;
-    Text: array [0 .. MaxHistory - 1] of ansistring;
-  end;
-
-  TCommandAllowedEnum = scDipNoticeStart .. scDipBreakStart;
+    n: Integer;
+    Text: array[0 .. MaxHistory - 1] of ansistring;
+  end;
+
+  TCommandAllowedEnum = scDipNoticeStart..scDipBreakStart;
 
   { TNegoDlg }

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -15 +15 @@
   public
     constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
     procedure SmartInvalidate; virtual;
   private
@@ -20 +21 @@
     MoveMousePos: TPoint;
     MoveActive: Boolean;
+    procedure VisibleChangedHandler(Sender: TObject);
   protected
     TitleHeight: Integer;
@@ -67 +69 @@
   inherited;
   TitleHeight := 0;
+  MoveActive := False;
+  AddHandlerOnVisibleChanged(VisibleChangedHandler);
+end;
+
+destructor TDrawDlg.Destroy;
+begin
+  RemoveHandlerOnVisibleChanging(VisibleChangedHandler);
+  inherited Destroy;
 end;
 
@@ -111 +121 @@
 var
   MousePosNew: TPoint;
+  NewFormPos: TPoint;
 begin
   inherited;
   {$IFDEF LINUX}
   // HitTest is not supported under Linux GTK2 so use form inside move mechanizm
-  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;
+  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;
@@ -149 +164 @@
   MoveActive := False;
   inherited;
+end;
+
+procedure TDrawDlg.VisibleChangedHandler(Sender: TObject);
+begin
+  MoveActive := False;
 end;
 

trunk/Packages/CevoComponents/Sound.pas

@@ -99 +99 @@
   {$ENDIF}
   {$IFDEF LINUX}
-  {$IFNDEF WINDOWS}
   FreeAndNil(SoundPlayerSyncProcess);
   FreeAndNil(SoundPlayerAsyncProcess);
-  {$ENDIF}
   {$ENDIF}
   inherited Destroy;

trunk/Packages/CevoComponents/StringTables.pas

@@ -17 +17 @@
     destructor Destroy; override;
     function LoadFromFile(const FileName: String): boolean;
-    function GetHandle(const Item: AnsiString): integer;
+    function GetHandle(const Item: string): integer;
     function LookupByHandle(Handle: integer; Index: integer = -1): string;
     function Lookup(const Item: string; Index: integer = -1): string;
@@ -55 +55 @@
 end;
 
-function TStringTable.GetHandle(const Item: AnsiString): integer;
+function TStringTable.GetHandle(const Item: string): integer;
 var
   I: Integer;