Explorar o código

refactor run script

johann %!s(int64=5) %!d(string=hai) anos
pai
achega
61486f6bbe
Modificáronse 2 ficheiros con 14 adicións e 3 borrados
  1. 14 1
      lazpaint/lazpaintinstance.pas
  2. 0 2
      lazpaint/lazpaintmainform.pas

+ 14 - 1
lazpaint/lazpaintinstance.pas

@@ -1335,8 +1335,20 @@ var
   fError: TForm;
   fError: TForm;
   memo: TMemo;
   memo: TMemo;
   doFound, somethingDone: boolean;
   doFound, somethingDone: boolean;
+  tmi: TTopMostInfo;
 begin
 begin
   p := nil;
   p := nil;
+
+  if ToolManager.TextShadow then
+  begin
+    //text shadow will be replaced in the future so do not allow it
+    if ToolManager.ToolProvideCommand(tcFinish) then
+      ToolManager.ToolCommand(tcFinish);
+    ToolManager.TextShadow := false;
+  end;
+
+  tmi := HideTopmost;
+  if Assigned(FMain) then FMain.Enabled:= false;
   try
   try
     p := TPythonScript.Create;
     p := TPythonScript.Create;
     FScriptName := AFilename;
     FScriptName := AFilename;
@@ -1371,6 +1383,8 @@ begin
     end;
     end;
   end;
   end;
   p.Free;
   p.Free;
+  if Assigned(FMain) then FMain.Enabled:= true;
+  ShowTopmost(tmi);
   //ensure we are out of any do group
   //ensure we are out of any do group
   repeat
   repeat
     Image.DoEnd(doFound, somethingDone);
     Image.DoEnd(doFound, somethingDone);
@@ -1386,7 +1400,6 @@ begin
     ToolManager.ForeColor := FChooseColor.GetCurrentColor else
     ToolManager.ForeColor := FChooseColor.GetCurrentColor else
   if FChooseColor.colorTarget = ctBackColor then
   if FChooseColor.colorTarget = ctBackColor then
     ToolManager.BackColor := FChooseColor.GetCurrentColor;
     ToolManager.BackColor := FChooseColor.GetCurrentColor;
-  if Assigned(FMain) then FMain.UpdateEditPicture;
   InColorFromFChooseColor := false;
   InColorFromFChooseColor := false;
 end;
 end;
 
 

+ 0 - 2
lazpaint/lazpaintmainform.pas

@@ -3568,7 +3568,6 @@ var
   tmi: TTopMostInfo;
   tmi: TTopMostInfo;
 begin
 begin
   tmi := LazPaintInstance.HideTopmost;
   tmi := LazPaintInstance.HideTopmost;
-  self.Enabled := false;
   try
   try
     dlg := TOpenDialog.Create(nil);
     dlg := TOpenDialog.Create(nil);
     try
     try
@@ -3587,7 +3586,6 @@ begin
     end;
     end;
     dlg.Free;
     dlg.Free;
   finally
   finally
-    self.Enabled := true;
     LazPaintInstance.ShowTopmost(tmi);
     LazPaintInstance.ShowTopmost(tmi);
   end;
   end;
 end;
 end;