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: DialogAPI - show dialog from a non-main thread

Browse source
This commit is contained in:
Alexander Koblov 2024-11-16 14:56:27 +03:00
commit 2c7934f31e
1 changed files with 45 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/fdialogbox.pas
View file

@ -92,7 +92,6 @@ type
function SetProperty(AComponent: TComponent; const AName: String; AValue: Pointer; AType: Integer): Boolean;
function GetProperty(AComponent: TComponent; const AName: String; AValue: Pointer; AType, ASize: Integer): Boolean;
protected
procedure ShowDialogBox;
procedure ProcessResource; override;
function InitResourceComponent(Instance: TComponent; RootAncestor: TClass): Boolean;
public
@ -100,6 +99,19 @@ type
destructor Destroy; override;
end;
{ TDialogBoxData }
TDialogBoxData = class
private
FLRSData: String;
FDlgProc: TDlgProc;
FUserData: Pointer;
DialogResult: LongBool;
procedure ShowDialogBox;
public
constructor Create(const LRSData: String; DlgProc: TDlgProc; UserData: Pointer);
end;
function InputBox(Caption, Prompt: PAnsiChar; MaskInput: LongBool; Value: PAnsiChar; ValueMaxLen: Integer): LongBool; dcpcall;
function MessageBox(Text, Caption: PAnsiChar; Flags: Longint): Integer; dcpcall;
function MsgChoiceBox(Text, Caption: PAnsiChar; Buttons: PPAnsiChar; BtnDef, BtnEsc: Integer): Integer; dcpcall;
@ -166,19 +178,14 @@ end;
function DialogBox(const LRSData: String; DlgProc: TDlgProc; UserData: Pointer): LongBool;
var
Dialog: TDialogBox;
Data: PtrInt absolute UserData;
AData: TDialogBoxData;
begin
Dialog:= TDialogBox.Create(LRSData, DlgProc);
AData:= TDialogBoxData.Create(LRSData, DlgProc, UserData);
try
with Dialog do
begin
Tag:= Data;
TThread.Synchronize(nil, @ShowDialogBox);
Result:= FResult;
end;
TThread.Synchronize(nil, @AData.ShowDialogBox);
Result:= AData.DialogResult;
finally
FreeAndNil(Dialog);
AData.Free;
end;
end;
@ -699,11 +706,6 @@ end;
{ TDialogBox }
procedure TDialogBox.ShowDialogBox;
begin
FResult:= (ShowModal = mrOK);
end;
procedure TDialogBox.ProcessResource;
begin
if not InitResourceComponent(Self, TForm) then
@ -1162,6 +1164,33 @@ begin
end;
end;
{ TDialogBoxData }
procedure TDialogBoxData.ShowDialogBox;
var
UserData: Pointer;
Dialog: TDialogBox;
TagData: PtrInt absolute UserData;
begin
Dialog:= TDialogBox.Create(FLRSData, FDlgProc);
try
UserData:= FUserData;
Dialog.Tag:= TagData;
DialogResult:= (Dialog.ShowModal = mrOK);
finally
FreeAndNil(Dialog);
end;
end;
constructor TDialogBoxData.Create(const LRSData: String; DlgProc: TDlgProc;
UserData: Pointer);
begin
inherited Create;
FLRSData:= LRSData;
FDlgProc:= DlgProc;
FUserData:= UserData;
end;
initialization
RegisterClasses([TTimer, TButton, TBitBtn, TFileNameEdit,
TDirectoryEdit, TComboBox, TListBox, TCheckBox,