ACA when launched from ide will reference the current target and not be fixed to whatever it was launched with

Author: ollydev

Source/Simba.lpr

@@ -29,17 +29,17 @@
   SetHeapTraceOutput(Application.Location + '/' + IntToStr(GetProcessID()) + '.trc');
   {$ENDIF}
 
+  Application.CaptureExceptions := False;
+  Application.UpdateFormatSettings := False;
+  Application.Initialize();
+
   FormatSettings.DecimalSeparator := '.';
   FormatSettings.ThousandSeparator := ',';
   FormatSettings.DateSeparator := '-';
   FormatSettings.TimeSeparator := ':';
 
   SimbaInitialization_Call(ESimbaInit.CREATE);
 
-  Application.CaptureExceptions := False;
-  Application.UpdateFormatSettings := False;
-  Application.Initialize();
-
   if Application.HasOption('help') then
   begin
     DebugLn('Usage:');

Source/ide/simba.form_main.pas

@@ -250,8 +250,8 @@   TSimbaMainForm = class(TForm)
 
     // Handle main menu shortcuts if editor is focused
     procedure DoApplicationKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
-
     procedure DoTabLoaded(Sender: TObject);
+    function DoGetWindowForACA: TWindowHandle;
 
     procedure SetCustomFontSize(Value: Integer);
     procedure SetLayoutLocked(Value: Boolean);
@@ -291,7 +291,8 @@ implementation
   simba.aca, simba.dtmeditor, simba.env, simba.ide_dockinghelpers, simba.nativeinterface,
   simba.ide_simpleformatter, simba.component_theme,
   simba.threading, simba.ide_editor, simba.vartype_string, simba.misc,
-  simba.target;
+  simba.target,
+  simba.vartype_windowhandle;
 
 procedure TSimbaMainForm.HandleException(Sender: TObject; E: Exception);
 
@@ -746,14 +747,8 @@ procedure TSimbaMainForm.MenuItemDocumentationClick(Sender: TObject);
 end;
 
 procedure TSimbaMainForm.MenuItemACAClick(Sender: TObject);
-var
-  Target: TSimbaTarget;
 begin
-  Target := TSimbaTarget.Create();
-  if (SimbaMainToolBar.WindowSelection <> 0) then
-    Target.SetWindow(SimbaMainToolBar.WindowSelection);
-
-  ShowACA(Target, True);
+  ShowACA(@DoGetWindowForACA);
 end;
 
 procedure TSimbaMainForm.DoMenuItemRunClick(Sender: TObject);
@@ -1052,6 +1047,14 @@ procedure TSimbaMainForm.DoTabLoaded(Sender: TObject);
     AddRecentFile(TSimbaScriptTab(Sender).ScriptFileName);
 end;
 
+function TSimbaMainForm.DoGetWindowForACA: TWindowHandle;
+begin
+  if (SimbaMainToolBar.WindowSelection = 0) or (not SimbaMainToolBar.WindowSelection.IsValid) then
+    Result := GetDesktopWindow
+  else
+    Result := SimbaMainToolBar.WindowSelection;
+end;
+
 procedure TSimbaMainForm.MenuEditClick(Sender: TObject);
 begin
   if SimbaTabsForm.CurrentEditor <> nil then

Source/simba.aca.pas

@@ -13,7 +13,11 @@ interface
   Classes, SysUtils, Controls, ComCtrls, ExtCtrls, Forms, Graphics, Menus,
   simba.base, simba.colormath, simba.target;
 
+type
+  TGetWindow = function(): TWindowHandle of object;
+
   // ShowOnTop
+  procedure ShowACA(GetWindow: TGetWindow); overload;
   procedure ShowACA(Target: TSimbaTarget; ManageTarget: Boolean); overload;
   // ShowModal
   procedure ShowACA(Target: TSimbaTarget; ManageTarget: Boolean; out Color: TColorTolerance); overload;
@@ -51,6 +55,7 @@   TSimbaACA = class
     FColorListPopup: TPopupMenu;
     FDrawColorMenu: TMenuItem;
     FDrawColor: TColor;
+    FGetWindow: TGetWindow;
     FTarget: TSimbaTarget;
     FManageTarget: Boolean;
 
@@ -107,7 +112,8 @@   TSimbaACA = class
     procedure Add(Color: TColor);
     function GetBest: TColorTolerance;
   public
-    constructor Create(Target: TSimbaTarget; ManageTarget: Boolean = True); reintroduce;
+    constructor Create(Target: TSimbaTarget; ManageTarget: Boolean = True); reintroduce; overload;
+    constructor Create(GetWindow: TGetWindow); reintroduce; overload;
     destructor Destroy; override;
 
     property BestColor: TColorTolerance read GetBest;
@@ -341,6 +347,11 @@ procedure TSimbaACA.DoMatchColorClick(Sender: TObject);
 
 procedure TSimbaACA.DoUpdateImgClick(Sender: TObject);
 begin
+  if Assigned(@FGetWindow) then
+  begin
+    FTarget.SetWindow(FGetWindow());
+  end;
+
   FImageBox.SetImage(FTarget.GetImage());
   if (Length(FDebugTPA) > 0) then
     FButtonFindColor.Click()
@@ -753,6 +764,18 @@ constructor TSimbaACA.Create(Target: TSimbaTarget; ManageTarget: Boolean);
   end;
 end;
 
+constructor TSimbaACA.Create(GetWindow: TGetWindow);
+var
+  Target: TSimbaTarget;
+begin
+  Target := TSimbaTarget.Create();
+  Target.SetWindow(GetWindow());
+
+  Create(Target);
+
+  FGetWindow := GetWindow;
+end;
+
 destructor TSimbaACA.Destroy;
 begin
   if (FForm <> nil) then
@@ -788,6 +811,12 @@ function TSimbaACA.GetBest: TColorTolerance;
   Result.Multipliers[2] := String(FEditMulti3.Edit.Text).ToFloat(0);
 end;
 
+procedure ShowACA(GetWindow: TGetWindow);
+begin
+  with TSimbaACA.Create(GetWindow) do
+    Form.ShowOnTop();
+end;
+
 procedure ShowACA(Target: TSimbaTarget; ManageTarget: Boolean);
 begin
   with TSimbaACA.Create(Target, ManageTarget) do

Source/simba.target.pas

@@ -951,6 +951,10 @@ procedure TSimbaTarget.SetDesktop;
 
 procedure TSimbaTarget.SetWindow(Window: TWindowHandle);
 begin
+  // unchanged
+  if (FTargetKind = ESimbaTargetKind.WINDOW) and (FTargetWindow = Window) then
+    Exit;
+
   ChangeTarget(ESimbaTargetKind.WINDOW);
 
   FTargetWindow := Window;
@@ -980,6 +984,10 @@ procedure TSimbaTarget.SetWindow(Window: TWindowHandle);
 
 procedure TSimbaTarget.SetImage(Image: TSimbaImage);
 begin
+  // unchanged
+  if (FTargetKind = ESimbaTargetKind.IMAGE) and (FTargetImage = Image) then
+    Exit;
+
   ChangeTarget(ESimbaTargetKind.IMAGE);
 
   FTargetImage := Image;