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

EditBtn: fix clearing filter text on entering TCustomControlFilterEdit.

Browse Source 
git-svn-id: trunk@44679 -
This commit is contained in:
bart 2014-04-11 17:20:00 +00:00
parent 38aa838fa1
commit be1a5bc92c
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/editbtn.pas
View File

@ -183,7 +183,7 @@ type
procedure EditEndDrag(Target: TObject; X,Y: Integer); procedure EditEndDrag(Target: TObject; X,Y: Integer);
procedure EditEnter; virtual; procedure EditEnter; virtual;
procedure EditExit; virtual; procedure EditExit; virtual;
procedure EditKeyDown(var Key: word; Shift: TShiftState); procedure EditKeyDown(var Key: word; Shift: TShiftState); virtual;
procedure EditKeyPress( var Key: char); procedure EditKeyPress( var Key: char);
procedure EditKeyUp(var Key: word; Shift: TShiftState); procedure EditKeyUp(var Key: word; Shift: TShiftState);
procedure EditMouseDown(Button: TMouseButton; procedure EditMouseDown(Button: TMouseButton;
@ -240,6 +240,7 @@ type
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
function Focused: Boolean; virtual;
procedure Clear; procedure Clear;
procedure ClearSelection; virtual; procedure ClearSelection; virtual;
procedure CopyToClipboard; virtual; procedure CopyToClipboard; virtual;
@ -375,7 +376,7 @@ type
fSelectedPart: TObject; // Select this node on next update fSelectedPart: TObject; // Select this node on next update
fOnFilterItem: TFilterItemEvent; fOnFilterItem: TFilterItemEvent;
fOnCheckItem: TCheckItemEvent; fOnCheckItem: TCheckItemEvent;
procedure KeyDown(var Key: Word; Shift: TShiftState); override; procedure EditKeyDown(var Key: Word; Shift: TShiftState); override;
procedure EditChange; override; procedure EditChange; override;
procedure EditEnter; override; procedure EditEnter; override;
procedure EditExit; override; procedure EditExit; override;
@ -1541,6 +1542,11 @@ begin
inherited Destroy; inherited Destroy;
end; end;
function TCustomEditButton.Focused: Boolean;
begin
Result := FEdit.Focused;
end;
procedure TCustomEditButton.Clear; procedure TCustomEditButton.Clear;
begin begin
FEdit.Clear; FEdit.Clear;
@ -1642,8 +1648,8 @@ end;
procedure TCustomControlFilterEdit.FormActivate(Sender: TObject); procedure TCustomControlFilterEdit.FormActivate(Sender: TObject);
begin begin
fJustActivated:=fParentForm.ActiveControl=Self; fJustActivated:=fParentForm.ActiveControl=Self.FEdit;
if fParentForm.ActiveControl=Self then if fParentForm.ActiveControl=Self.FEdit then
Filter:=Text; Filter:=Text;
end; end;
@ -1684,7 +1690,7 @@ begin
Application.RemoveOnIdleHandler(@OnIdle); Application.RemoveOnIdleHandler(@OnIdle);
end; end;
procedure TCustomControlFilterEdit.KeyDown(var Key: Word; Shift: TShiftState); procedure TCustomControlFilterEdit.EditKeyDown(var Key: Word; Shift: TShiftState);
var var
Handled: Boolean; Handled: Boolean;
begin begin
@ -1698,7 +1704,7 @@ begin
if Handled then if Handled then
Key:=VK_UNKNOWN Key:=VK_UNKNOWN
else else
inherited KeyDown(Key, Shift); inherited EditKeyDown(Key, Shift);
end; end;
procedure TCustomControlFilterEdit.EditChange; procedure TCustomControlFilterEdit.EditChange;