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

ExamplesWindow: Improve moving focus to EditSearch control. Issue #40095, patch by dbannon.

Browse Source
This commit is contained in:
Juha 2023-01-21 22:50:04 +02:00
parent a3e63f4fa4
commit 9b0f2fd0fd
2 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
components/exampleswindow/ulaz_examples.lfm
View File

@ -21,7 +21,7 @@ object FormLazExam: TFormLazExam
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = CheckGroupCategory
Left = 6
Height = 158
Height = 148
Top = 157
Width = 769
Anchors = [akTop, akLeft, akRight, akBottom]
@ -45,9 +45,9 @@ object FormLazExam: TFormLazExam
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = Splitter2
Left = 6
Height = 117
Height = 111
Hint = 'Click for Info, Double Click to download'
Top = 29
Top = 35
Width = 775
Anchors = [akTop, akLeft, akRight, akBottom]
AutoSort = False
@ -62,7 +62,7 @@ object FormLazExam: TFormLazExam
Width = 10
end
item
Width = 10
Width = 740
end>
ParentShowHint = False
ReadOnly = True
@ -73,6 +73,7 @@ object FormLazExam: TFormLazExam
OnEnter = ListView1Enter
OnExit = ListView1Exit
OnKeyDown = ListView1KeyDown
OnKeyPress = ListView1KeyPress
OnSelectItem = ListView1SelectItem
end
object CheckGroupCategory: TCheckGroup
@ -81,8 +82,8 @@ object FormLazExam: TFormLazExam
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ButtonOpen
Left = 6
Height = 19
Top = 321
Height = 23
Top = 311
Width = 769
Anchors = [akLeft, akRight, akBottom]
AutoFill = True
@ -134,9 +135,9 @@ object FormLazExam: TFormLazExam
AnchorSideBottom.Control = ButtonOpen
AnchorSideBottom.Side = asrBottom
Left = 6
Height = 25
Top = 346
Width = 80
Height = 31
Top = 340
Width = 89
Anchors = [akLeft, akBottom]
AutoSize = True
BorderSpacing.Left = 6
@ -150,10 +151,10 @@ object FormLazExam: TFormLazExam
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ButtonOpen
AnchorSideBottom.Side = asrBottom
Left = 246
Height = 25
Top = 346
Width = 55
Left = 270
Height = 31
Top = 340
Width = 54
Anchors = [akLeft, akBottom]
AutoSize = True
BorderSpacing.Left = 6
@ -167,10 +168,10 @@ object FormLazExam: TFormLazExam
AnchorSideLeft.Side = asrBottom
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = StatusBar1
Left = 92
Height = 25
Top = 346
Width = 55
Left = 101
Height = 31
Top = 340
Width = 54
Anchors = [akLeft, akBottom]
AutoSize = True
BorderSpacing.Left = 6
@ -185,10 +186,10 @@ object FormLazExam: TFormLazExam
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = ButtonOpen
AnchorSideBottom.Side = asrBottom
Left = 153
Height = 25
Top = 346
Width = 87
Left = 161
Height = 31
Top = 340
Width = 103
Anchors = [akLeft, akBottom]
AutoSize = True
BorderSpacing.Left = 6
@ -201,7 +202,7 @@ object FormLazExam: TFormLazExam
AnchorSideTop.Control = Owner
AnchorSideRight.Control = ClearSearchButton
Left = 6
Height = 23
Height = 29
Hint = 'Searches for Keywords'
Top = 3
Width = 743
@ -210,6 +211,7 @@ object FormLazExam: TFormLazExam
BorderSpacing.Top = 3
BorderSpacing.Right = 3
OnChange = EditSearchChange
OnEnter = EditSearchEnter
OnKeyDown = EditSearchKeyDown
ParentShowHint = False
ShowHint = True
@ -222,7 +224,7 @@ object FormLazExam: TFormLazExam
AnchorSideRight.Side = asrBottom
Left = 752
Height = 22
Top = 3
Top = 6
Width = 23
Anchors = [akTop, akRight]
BorderSpacing.Left = 3

35
components/exampleswindow/ulaz_examples.pas
View File

@ -21,7 +21,7 @@ extension of ex-meta.
David Bannon, Dec 2022
}
{$mode objfpc}{$H+}
{$define EXTESTMODE}
{X$define EXTESTMODE}
{X$define ONLINE_EXAMPLES}
@ -29,12 +29,11 @@ interface
uses
Classes, SysUtils,
// LazUtils
LazFileUtils, fileutil, LazLoggerBase,
// LCL
LCLType, LCLIntf, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
ExtCtrls, Buttons, IDEImagesIntf,
ExtCtrls, Buttons,
{$ifndef EXTESTMODE}
IDEImagesIntf,
IDEWindowIntf,
{$endif}
uexampledata, uConst;
@ -63,6 +62,7 @@ type
procedure CheckGroupCategoryItemClick(Sender: TObject; {%H-}Index: integer);
procedure ClearSearchButtonClick(Sender: TObject);
procedure EditSearchChange(Sender: TObject);
procedure EditSearchEnter(Sender: TObject);
procedure EditSearchKeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
@ -73,8 +73,10 @@ type
procedure ListView1Enter(Sender: TObject);
procedure ListView1Exit(Sender: TObject);
procedure ListView1KeyDown(Sender: TObject; var Key: Word; {%H-}Shift: TShiftState);
procedure ListView1KeyPress(Sender: TObject; var Key: char);
procedure ListView1SelectItem(Sender: TObject; {%H-}Item: TListItem; {%H-}Selected: Boolean);
private
MoveFocusKey : char;
LastListViewIndex : integer; // If 0 or greater, its an index to ListView
procedure BuildSearchList(SL: TStringList; const Term: AnsiString);
// Copies the passed ex dir to a dir named for the Proj.
@ -212,10 +214,14 @@ begin
else
Exit;
ListView1DblClick(Sender);
end
else if not (Key in [VK_TAB, VK_ESCAPE, VK_PRIOR, VK_NEXT, VK_END, VK_HOME,
VK_LEFT, VK_UP, VK_RIGHT, VK_DOWN]) then
EditSearch.SetFocus;
end;
end;
procedure TFormLazExam.ListView1KeyPress(Sender: TObject; var Key: char);
begin
MoveFocusKey := Key;
Key := char(0);
EditSearch.SetFocus;
end;
// --------------------- B U T T O N S -----------------------------------------
@ -422,6 +428,16 @@ begin
KeyWordSearch();
end;
procedure TFormLazExam.EditSearchEnter(Sender: TObject); // check to see if a char has been forwarded on from ListView
begin
if MoveFocusKey <> char(0) then begin // not all of this is needed for each widgetset, but does no harm
EditSearch.Caption := EditSearch.Caption + MoveFocusKey;
EditSearch.SelStart := length(EditSearch.Caption);
EditSearch.SelLength := 0;
MoveFocusKey := char(0);
end;
end;
procedure TFormLazExam.EditSearchKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState);
begin
@ -461,6 +477,7 @@ end;
procedure TFormLazExam.FormCreate(Sender: TObject);
begin
MoveFocusKey := char(0);
Caption := rsExampleProjects;
ListView1.Column[0].Caption := rsExampleName;
ListView1.Column[1].Caption := rsExampleKeyWords;
@ -478,8 +495,10 @@ begin
LastListViewIndex := -1; // Used to record ListView1.ItemIndex before Tabbing away
EditSearch.TextHint := rsExSearchPrompt;
{$ifndef EXTESTMODE}
ClearSearchButton.Images := IDEImages.Images_16;
ClearSearchButton.ImageIndex := IDEImages.GetImageIndex('btnfiltercancel');
{$endif}
ClearSearchButton.Enabled := False;
CheckGroupCategory.Hint := rsGroupHint;
Ex := nil;