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

designer: skip invisible controls during keyboard traverse

Browse Source 
git-svn-id: trunk@21754 -
This commit is contained in:
paul 2009-09-18 06:09:10 +00:00
parent eeba75a1a6
commit f4defcfde3
1 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
designer/designer.pp
View File

@ -628,7 +628,7 @@ begin
for i := 0 to ControlSelection.SelectionForm.ComponentCount - 1 do
begin
AComponent := ControlSelection.SelectionForm.Components[i];
if AComponent = Current then
if (AComponent = Current) or ComponentIsInvisible(AComponent) then
Continue;
Test := GetParentFormRelativeClientOrigin(AComponent);
if (Abs(Test.Y - Coord.Y) <= Delta) and
@ -652,7 +652,7 @@ begin
for i := 0 to ControlSelection.SelectionForm.ComponentCount - 1 do
begin
AComponent := ControlSelection.SelectionForm.Components[i];
if AComponent = Current then
if (AComponent = Current) or ComponentIsInvisible(AComponent) then
Continue;
Test := GetParentFormRelativeClientOrigin(AComponent);
if (Abs(Test.X - Coord.X) <= Delta) and
@ -681,8 +681,25 @@ begin
end;
procedure TDesigner.NudgeSelection(SelectNext: Boolean);
function StepIndex(Index: Integer): Integer;
begin
Result := Index;
if SelectNext then
Inc(Result)
else
Dec(Result);
if Result >= ControlSelection.SelectionForm.ComponentCount then
Result := 0
else
if Result < 0 then
Result := ControlSelection.SelectionForm.ComponentCount - 1;
end;
var
Index: Integer;
Index, StartIndex: Integer;
AComponent: TComponent;
begin
if (ControlSelection.SelectionForm <> Form) or
(ControlSelection.SelectionForm.ComponentCount = 0) then Exit;
@ -691,19 +708,27 @@ begin
else
Index := -1;
if SelectNext then
Inc(Index)
else
Dec(Index);
Index := StepIndex(Index);
StartIndex := Index;
if Index >= ControlSelection.SelectionForm.ComponentCount then
Index := 0
else
if Index < 0 then
Index := ControlSelection.SelectionForm.ComponentCount - 1;
AComponent := nil;
while AComponent = nil do
begin
AComponent := ControlSelection.SelectionForm.Components[Index];
if ComponentIsInvisible(AComponent) then
begin
AComponent := nil;
Index := StepIndex(Index);
if Index = StartIndex then
break;
end;
end;
ControlSelection.AssignPersistent(ControlSelection.SelectionForm.Components[Index]);
Modified;
if AComponent <> nil then
begin
ControlSelection.AssignPersistent(AComponent);
Modified;
end;
end;
procedure TDesigner.SelectParentOfSelection;