paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 20:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed finding class after class completion

Browse Source 
git-svn-id: trunk@6513 -
This commit is contained in:
mattias 2005-01-08 16:23:55 +00:00
parent 2ca5b0d2f8
commit 66a176a847
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/codetools/codecompletiontool.pas
View File

@ -2268,6 +2268,11 @@ var CleanCursorPos, Indent, insertPos: integer;
CursorNode:=FindDeepestNodeAtPos(CleanCursorPos,true);
// due to insertions in fron of the class, the cursor position could
// have changed
while (CursorNode<>nil) do begin
if (CursorNode.Desc in [ctnTypeSection,ctnTypeDefinition,ctnClass])
then break;
CursorNode:=CursorNode.Parent;
end;
FCodeCompleteClassNode:=
FindClassNode(CursorNode,CurClassName,true,false);
if FCodeCompleteClassNode=nil then

39
components/rtticontrols/rttigrids.pas
View File

@ -24,7 +24,7 @@ unit RTTIGrids;
interface
uses
Classes, SysUtils, ObjectInspector, PropEdits, RTTICtrls, Grids;
Classes, SysUtils, LCLProc, ObjectInspector, PropEdits, RTTICtrls, Grids;
type
{ TTICustomPropertyGrid }
@ -79,9 +79,12 @@ type
TTICustomGrid = class(TCustomGrid)
private
FAutoFreeHook: boolean;
FListDirection: TTIListDirection;
FListObject: TObject;
FSaveOnChangeTIObject: boolean;
FTIStates: TTIGridStates;
procedure SetAutoFreeHook(const AValue: boolean);
procedure SetListDirection(const AValue: TTIListDirection);
procedure SetListObject(const AValue: TObject);
protected
@ -94,6 +97,10 @@ type
property ListObject: TObject read FListObject write SetListObject;
property ListDirection: TTIListDirection read FListDirection write SetListDirection;
property DefaultRowHeight default 20;
property AutoFreeHook: boolean read FAutoFreeHook write SetAutoFreeHook;
property SaveOnChangeTIObject: boolean read FSaveOnChangeTIObject
write FSaveOnChangeTIObject
default true;
end;
@ -113,6 +120,8 @@ type
property DefaultRowHeight;
property Enabled;
property FixedColor;
property FixedCols;
property FixedRows;
property Flat;
property Font;
property OnDblClick;
@ -158,6 +167,12 @@ begin
ReloadTIList;
end;
procedure TTICustomGrid.SetAutoFreeHook(const AValue: boolean);
begin
if FAutoFreeHook=AValue then exit;
FAutoFreeHook:=AValue;
end;
procedure TTICustomGrid.SetListObject(const AValue: TObject);
begin
if FListObject=AValue then exit;
@ -184,14 +199,26 @@ procedure TTICustomGrid.LoadCollection;
var
TheCollection: TCollection;
ObjectCount: LongInt;
CurItem: TCollectionItem;
HeaderLines: LongInt;
begin
TheCollection:=FListObject as TCollection;
ObjectCount:=TheCollection.Count;
if ListDirection=tldObjectsAsRows then
RowCount:=FixedRows+ObjectCount
else
ColCount:=FixedCols+ObjectCount;
if ListDirection=tldObjectsAsRows then begin
HeaderLines:=FixedRows;
RowCount:=HeaderLines+ObjectCount
end else begin
HeaderLines:=FixedCols;
ColCount:=HeaderLines+ObjectCount;
end;
// get first object to create the grid header
if ObjectCount=0 then exit;
CurItem:=TheCollection.Items[0];
if not (CurItem is TPersistent) then begin
debugln('TTICustomGrid.LoadCollection First CollectionItem=',dbgsName(CurItem));
exit;
end;
end;
constructor TTICustomGrid.Create(TheOwner: TComponent);