mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-14 10:39:18 +02:00
lcl: don't set ShowHint in CMParentShowHintChanged during loading, update ShowHint from ParentShowHint in Loaded (fixes issue #0013969)
git-svn-id: trunk@20614 -
This commit is contained in:
parent
1c2b75ab5f
commit
881d1ac331
@ -724,7 +724,7 @@ end;
|
|||||||
------------------------------------------------------------------------------}
|
------------------------------------------------------------------------------}
|
||||||
procedure TControl.CMParentColorChanged(var Message: TLMessage);
|
procedure TControl.CMParentColorChanged(var Message: TLMessage);
|
||||||
begin
|
begin
|
||||||
if csLoading in ComponentState then exit;
|
if csLoading in ComponentState then Exit;
|
||||||
|
|
||||||
if FParentColor then
|
if FParentColor then
|
||||||
begin
|
begin
|
||||||
@ -740,6 +740,8 @@ end;
|
|||||||
------------------------------------------------------------------------------}
|
------------------------------------------------------------------------------}
|
||||||
procedure TControl.CMParentShowHintChanged(var Message: TLMessage);
|
procedure TControl.CMParentShowHintChanged(var Message: TLMessage);
|
||||||
begin
|
begin
|
||||||
|
if csLoading in ComponentState then Exit;
|
||||||
|
|
||||||
if FParentShowHint then
|
if FParentShowHint then
|
||||||
begin
|
begin
|
||||||
ShowHint := FParent.ShowHint;
|
ShowHint := FParent.ShowHint;
|
||||||
@ -2888,20 +2890,30 @@ begin
|
|||||||
SetBoundsKeepBase(Left,Top,NewWidth,NewHeight);
|
SetBoundsKeepBase(Left,Top,NewWidth,NewHeight);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
if Assigned(Parent) then begin
|
if Assigned(Parent) then
|
||||||
if ParentColor then begin
|
begin
|
||||||
|
if ParentColor then
|
||||||
|
begin
|
||||||
Color := Parent.Color;
|
Color := Parent.Color;
|
||||||
ParentColor := true;
|
ParentColor := True;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
if ParentFont then begin
|
if ParentFont then
|
||||||
|
begin
|
||||||
Font := Parent.Font;
|
Font := Parent.Font;
|
||||||
ParentFont := true;
|
ParentFont := True;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
if ParentBidiMode then begin
|
if ParentBidiMode then
|
||||||
|
begin
|
||||||
BiDiMode := Parent.BiDiMode;
|
BiDiMode := Parent.BiDiMode;
|
||||||
ParentBidiMode := true;
|
ParentBidiMode := True;
|
||||||
|
end;
|
||||||
|
|
||||||
|
if ParentShowHint then
|
||||||
|
begin
|
||||||
|
ShowHint := Parent.ShowHint;
|
||||||
|
ParentShowHint := True;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user