mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-03 00:00:39 +02:00
LCL, grids, fixed AutoAdvance when grid has goRowSelect option, reported by Barko
git-svn-id: trunk@12529 -
This commit is contained in:
parent
713a847fd8
commit
4c24b68ea9
@ -1760,8 +1760,7 @@ begin
|
|||||||
doOnKeyDown;
|
doOnKeyDown;
|
||||||
if Key<>0 then begin
|
if Key<>0 then begin
|
||||||
if dgTabs in Options then begin
|
if dgTabs in Options then begin
|
||||||
|
if GetDeltaMoveNext(ssShift in Shift, DeltaCol, DeltaRow) then begin
|
||||||
GetDeltaMoveNext(ssShift in Shift, DeltaCol, DeltaRow);
|
|
||||||
|
|
||||||
if DeltaRow > 0 then begin
|
if DeltaRow > 0 then begin
|
||||||
if doVKDown then
|
if doVKDown then
|
||||||
@ -1774,7 +1773,7 @@ begin
|
|||||||
|
|
||||||
if (DeltaCol<>0) then
|
if (DeltaCol<>0) then
|
||||||
Col := Col + DeltaCol;
|
Col := Col + DeltaCol;
|
||||||
|
end;
|
||||||
Key := 0;
|
Key := 0;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
@ -1788,11 +1787,12 @@ begin
|
|||||||
if (dgEditing in Options) and not EditorMode then
|
if (dgEditing in Options) and not EditorMode then
|
||||||
EditorMode:=true
|
EditorMode:=true
|
||||||
else begin
|
else begin
|
||||||
GetDeltaMoveNext(ssShift in Shift, DeltaCol, DeltaRow);
|
if GetDeltaMoveNext(ssShift in Shift, DeltaCol, DeltaRow) then begin
|
||||||
if DeltaRow > 0 then
|
if DeltaRow > 0 then
|
||||||
doVKDown;
|
doVKDown;
|
||||||
if DeltaCol <> 0 then
|
if DeltaCol <> 0 then
|
||||||
Col := Col + DeltaCol;
|
Col := Col + DeltaCol;
|
||||||
|
end;
|
||||||
ResetEditor;
|
ResetEditor;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
@ -6261,6 +6261,13 @@ begin
|
|||||||
if FAutoAdvance=aaNone then
|
if FAutoAdvance=aaNone then
|
||||||
exit; // quick case, no auto movement allowed
|
exit; // quick case, no auto movement allowed
|
||||||
|
|
||||||
|
if [goRowSelect,goRelaxedRowSelect]*Options=[goRowSelect] then begin
|
||||||
|
if Inverse then
|
||||||
|
ACol := FixedCols
|
||||||
|
else
|
||||||
|
ACol := ColCount-1;
|
||||||
|
end;
|
||||||
|
|
||||||
// browse the grid in autoadvance order
|
// browse the grid in autoadvance order
|
||||||
while CalcNextStep do begin
|
while CalcNextStep do begin
|
||||||
ACol := ACol + DeltaCol;
|
ACol := ACol + DeltaCol;
|
||||||
|
Loading…
Reference in New Issue
Block a user