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

LCL: Use the new TextHint in FilterEdit. Issue #28070, patch from Alexey Torgashin.

Browse Source 
git-svn-id: trunk@49008 -
This commit is contained in:
juha 2015-05-12 22:26:40 +00:00
parent 801a25a549
commit 81f5c05782
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/editbtn.pas
View File

@ -1934,6 +1934,7 @@ begin
Button.Enabled:=False;
fIsFirstUpdate:=True;
fIsFirstSetFormActivate:=True;
TextHint:=rsFilter;
end;
destructor TCustomControlFilterEdit.Destroy;
@ -1999,7 +2000,7 @@ procedure TCustomControlFilterEdit.SetFilter(const AValue: string);
var
NewValue: String;
begin
if AValue=rsFilter then
if (TextHint<>'') and (AValue=TextHint) then
NewValue:=''
else
NewValue:=AValue;
@ -2007,11 +2008,6 @@ begin
if (NewValue<>'') or Focused or fJustActivated or (csDesigning in ComponentState) then
begin
Text:=NewValue;
Font.Color:=clDefault;
end
else begin
Text:=rsFilter;
Font.Color:=clBtnShadow;
end;
if fFilter=NewValue then exit;
fFilter:=NewValue;
@ -2055,8 +2051,6 @@ procedure TCustomControlFilterEdit.EditEnter;
begin
// inherited;
fJustActivated:=False;
if Text=rsFilter then
Text:='';
end;
procedure TCustomControlFilterEdit.EditExit;
@ -2069,6 +2063,7 @@ end;
procedure TCustomControlFilterEdit.ButtonClick;
begin
fJustActivated:=False;
Text:='';
Filter:='';
if FocusOnButtonClick then FEdit.SetFocus; //don't SelectAll here
end;