merge r55716 #bdb91bdc6d

lcl: edit: force show texthint in InitializeWnd. Issue #32053 

git-svn-id: branches/fixes_1_8@55741 -
This commit is contained in:
ondrej 2017-08-24 05:43:06 +00:00
parent 5309d6767d
commit 547fe3cdbe
2 changed files with 5 additions and 4 deletions

View File

@ -53,7 +53,8 @@ begin
if WidgetSet.GetLCLCapability(lcTextHint) = LCL_CAPABILITY_YES then
TWSCustomEditClass(WidgetSetClass).SetTextHint(Self, FTextHint)
else
if CanShowEmulatedTextHint then ShowEmulatedTextHint;
if CanShowEmulatedTextHint then
ShowEmulatedTextHint(True);
end;
{------------------------------------------------------------------------------
@ -691,11 +692,11 @@ begin
DebugLn('TCustomEdit.TextHintFontStyle is deprecated and will be removed in Lazarus 1.9');
end;
procedure TCustomEdit.ShowEmulatedTextHint;
procedure TCustomEdit.ShowEmulatedTextHint(const ForceShow: Boolean);
var
HintFont: TFont;
begin
if (FEmulatedTextHintStatus<>thsHidden) then
if (FEmulatedTextHintStatus<>thsHidden) and not ForceShow then
Exit;
FEmulatedTextHintStatus := thsChanging;

View File

@ -731,7 +731,7 @@ type
FTextHint: TTranslateString;
function GetTextHintFontColor: TColor; //Remove in 1.9
function GetTextHintFontStyle: TFontStyles; //Remove in 1.9
procedure ShowEmulatedTextHint;
procedure ShowEmulatedTextHint(const ForceShow: Boolean = False);
procedure HideEmulatedTextHint;
procedure SetAlignment(const AValue: TAlignment);
function GetCanUndo: Boolean;