paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 00:29:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL/TaskDialog: Fix command and radio buttons on TaskDialog being exchanged in non-Windows widget sets.

Browse Source
This commit is contained in:
wp_xyz 2022-09-20 23:47:19 +02:00
parent 5efaca564c
commit b442769bb0
1 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lcl/lcltaskdialog.pas
View File

@ -925,6 +925,43 @@ begin
if Info<>'' then if Info<>'' then
// no information collapse/expand yet: it's always expanded // no information collapse/expand yet: it's always expanded
Dialog.Form.Element[tdeExpandedInfo] := AddLabel(Info, false); Dialog.Form.Element[tdeExpandedInfo] := AddLabel(Info, false);
// add radio buttons
if Radios<>'' then
begin
{$IFDEF MSWINDOWS}
if WidgetSet.GetLCLCapability(lcNativeTaskDialog) = LCL_CAPABILITY_NO then
ARadioOffset := 1
else
ARadioOffset := 0;
{$ELSE}
ARadioOffset := 1;
{$ENDIF}
with TStringList.Create do
try
Text := SysUtils.trim(Radios);
SetLength(Rad,Count);
for i := 0 to Count-1 do begin
Rad[i] := TRadioButton.Create(Dialog.Form);
with Rad[i] do begin
Parent := Par;
SetBounds(X+16,Y,aWidth-32-X, (6-FontHeight) + ARadioOffset);
Caption := NoCR(Strings[i]);
if aHint<>'' then begin
ShowHint := true;
Hint := aHint; // note shown as Hint
end;
inc(Y,Height + ARadioOffset);
if (i=0) or (i+200=aRadioDef) then
Checked := true;
end;
end;
inc(Y,24);
finally
Free;
end;
end;
// add command links buttons // add command links buttons
if (tdfUseCommandLinks in aFlags) and (Buttons<>'') then if (tdfUseCommandLinks in aFlags) and (Buttons<>'') then
with TStringList.Create do with TStringList.Create do
@ -976,41 +1013,7 @@ begin
finally finally
Free; Free;
end; end;
// add radio buttons
if Radios<>'' then
begin
{$IFDEF MSWINDOWS}
if WidgetSet.GetLCLCapability(lcNativeTaskDialog) = LCL_CAPABILITY_NO then
ARadioOffset := 1
else
ARadioOffset := 0;
{$ELSE}
ARadioOffset := 1;
{$ENDIF}
with TStringList.Create do
try
Text := SysUtils.trim(Radios);
SetLength(Rad,Count);
for i := 0 to Count-1 do begin
Rad[i] := TRadioButton.Create(Dialog.Form);
with Rad[i] do begin
Parent := Par;
SetBounds(X+16,Y,aWidth-32-X, (6-FontHeight) + ARadioOffset);
Caption := NoCR(Strings[i]);
if aHint<>'' then begin
ShowHint := true;
Hint := aHint; // note shown as Hint
end;
inc(Y,Height + ARadioOffset);
if (i=0) or (i+200=aRadioDef) then
Checked := true;
end;
end;
inc(Y,24);
finally
Free;
end;
end;
// add selection list or query editor // add selection list or query editor
if Selection<>'' then begin if Selection<>'' then begin
List := TStringListUTF8Fast.Create; List := TStringListUTF8Fast.Create;