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

merge r55716 #bdb91bdc6d

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/include/customedit.inc
View File

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

2
lcl/stdctrls.pp
View File

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