improved icons, started codeexplorer

git-svn-id: trunk@2192 -
This commit is contained in:
mattias 2002-08-17 23:41:06 +00:00
parent 41a09504d9
commit 9dc9fb808f

View File

@ -542,9 +542,7 @@ Begin
Writeln(', No CTRL down'); Writeln(', No CTRL down');
{$ENDIF} {$ENDIF}
SelectedCompClass:=nil; SelectedCompClass:=GetSelectedComponentClass;
if Assigned(FOnGetSelectedComponentClass) then
FOnGetSelectedComponentClass(Self,SelectedCompClass);
NonVisualComp:=NonVisualComponentAtPos(MouseDownPos.X,MouseDownPos.Y); NonVisualComp:=NonVisualComponentAtPos(MouseDownPos.X,MouseDownPos.Y);
if NonVisualComp<>nil then MouseDownComponent:=NonVisualComp; if NonVisualComp<>nil then MouseDownComponent:=NonVisualComp;
@ -558,11 +556,12 @@ Begin
if SelectedCompClass = nil then begin if SelectedCompClass = nil then begin
// selection mode // selection mode
if ControlSelection.ActiveGrabber=nil then begin if ControlSelection.ActiveGrabber=nil then begin
// no grabber resizing
CompIndex:=ControlSelection.IndexOf(MouseDownComponent); CompIndex:=ControlSelection.IndexOf(MouseDownComponent);
if (TheMessage.Keys and MK_SHIFT)>0 then begin if (TheMessage.Keys and MK_SHIFT)>0 then begin
// shift key pressed (multiselection) // shift key pressed (multiselection)
if CompIndex<0 then begin if CompIndex<0 then begin
// not selected // not selected
// add component to selection // add component to selection
@ -582,8 +581,8 @@ Begin
InvalidateWithParent(MouseDownComponent); InvalidateWithParent(MouseDownComponent);
end; end;
end else begin end else begin
// no shift key (single selection) // no shift key (single selection)
if (CompIndex<0) then begin if (CompIndex<0) then begin
// select only this component // select only this component
@ -800,13 +799,11 @@ Begin
ControlSelection.ActiveGrabber:=nil; ControlSelection.ActiveGrabber:=nil;
RubberBandWasActive:=ControlSelection.RubberBandActive; RubberBandWasActive:=ControlSelection.RubberBandActive;
SelectedCompClass:=GetSelectedComponentClass;
GetShift; GetShift;
MouseUpPos:=GetFormRelativeMousePosition(Form); MouseUpPos:=GetFormRelativeMousePosition(Form);
SelectedCompClass:=GetSelectedComponentClass;
{$IFDEF VerboseDesigner} {$IFDEF VerboseDesigner}
writeln('************************************************************'); writeln('************************************************************');
write('MouseUpOnControl'); write('MouseUpOnControl');
@ -923,9 +920,11 @@ begin
FCustomForm.Invalidate; FCustomForm.Invalidate;
if Assigned(OnModified) then OnModified(Self); if Assigned(OnModified) then OnModified(Self);
end else begin end else begin
// no grabber resizing
if (not ComponentIsTopLvl(MouseDownComponent)) if (not ComponentIsTopLvl(MouseDownComponent))
and (ControlSelection.Count>=1) and (ControlSelection.Count>=1)
and not (ControlSelection[0].Component is TCustomForm) then and not (ControlSelection.IsSelected(Form))
and (GetSelectedComponentClass=nil) then
begin begin
// move selection // move selection
if not (dfHasSized in FFlags) then begin if not (dfHasSized in FFlags) then begin