mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Restore focus when close standalone form under Mac OS X Qt + warnings fixes

Browse source
This commit is contained in:
Alexander Koblov 2013-06-23 09:35:49 +00:00
commit f1df1eb320
3 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/platform/uOSUtils.pas
View file

@ -291,7 +291,7 @@ begin
else if pid > 0 then { Parent }
begin
WaitForPidThread := TWaitForPidThread.Create(pid);
WaitForPidThread.Resume;
WaitForPidThread.Start;
end;
Result := (pid > 0);

4
src/platform/udrivewatcher.pas
View file

@ -211,7 +211,7 @@ begin
{$IFDEF BSD}
KQueueDriveWatcher := TKQueueDriveEventWatcher.Create();
KQueueDriveWatcher.OnDriveEvent := @KQueueDriveWatcher_OnDriveEvent;
KQueueDriveWatcher.Resume;
KQueueDriveWatcher.Start;
{$ENDIF}
end;
@ -1171,4 +1171,4 @@ end;
{$ENDIF}
end.

43
src/platform/uosforms.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
This unit contains platform depended functions.
Copyright (C) 2006-2012 Koblov Alexander (Alexx2000@mail.ru)
Copyright (C) 2006-2013 Koblov Alexander (Alexx2000@mail.ru)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -35,7 +35,12 @@ type
{ TAloneForm }
TAloneForm = class(TForm)
{$IF DEFINED(LCLWIN32)}
{$IF DEFINED(DARWIN) AND DEFINED(LCLQT)}
protected
FActiveForm: TForm;
procedure DoShow; override;
procedure DoClose(var CloseAction: TCloseAction); override;
{$ELSEIF DEFINED(LCLWIN32)}
public
constructor Create(TheOwner: TComponent); override;
{$ENDIF}
@ -107,13 +112,43 @@ uses
, BaseUnix, fFileProperties, uJpegThumb
{$IF NOT DEFINED(DARWIN)}
, uMagickWand
{$ELSE}
, MacOSAll
{$ENDIF}
{$ENDIF};
{$IF DEFINED(LCLWIN32)}
{ TAloneForm }
{$IF DEFINED(DARWIN) AND DEFINED(LCLQT)}
procedure TAloneForm.DoShow;
begin
// Save current active form
FActiveForm:= Screen.ActiveForm;
inherited DoShow;
end;
procedure TAloneForm.DoClose(var CloseAction: TCloseAction);
var
psnFront, psnCurrent: ProcessSerialNumber;
begin
inherited DoClose(CloseAction);
if (GetCurrentProcess(psnCurrent) = noErr) and (GetFrontProcess(psnFront) = noErr) then
begin
// Check that our process is active and form still exists
if (psnCurrent.lowLongOfPSN = psnFront.lowLongOfPSN) and
(psnCurrent.highLongOfPSN = psnFront.highLongOfPSN) and
(Screen.FormIndex(FActiveForm) >= 0) then
begin
// Restore active form
if (FActiveForm.WindowState <> wsMinimized) then
FActiveForm.SetFocus;
end;
end;
end;
{$ELSEIF DEFINED(LCLWIN32)}
constructor TAloneForm.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);