GitHub-Mirror/x2cl
1
0
Fork 0
mirror of synced 2024-11-22 01:53:50 +00:00
Code Issues Projects Releases Wiki Activity

Fixed: List index out of bounds when multiple containers are on a form

Browse Source 
Fixed: no need to move/remove graphics in the internal list if conversion is disabled
This commit is contained in:
Mark van Renswoude 2012-05-02 13:59:12 +00:00
parent 9feef16168
commit e681c29456
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/X2CLGraphicList.pas
View File

@ -662,8 +662,11 @@ begin
opRemove: opRemove:
begin begin
if AComponent is TX2GraphicContainerItem then if (AComponent is TX2GraphicContainerItem) and
RemoveGraphic(TX2GraphicContainerItem(AComponent)) (TX2GraphicContainerItem(AComponent).Container = Self) then
begin
RemoveGraphic(TX2GraphicContainerItem(AComponent));
end;
else if AComponent is TX2GraphicList then else if AComponent is TX2GraphicList then
Lists.Remove(AComponent); Lists.Remove(AComponent);
@ -1263,22 +1266,29 @@ end;
procedure TX2GraphicList.DeleteImage(const AIndex: Integer); procedure TX2GraphicList.DeleteImage(const AIndex: Integer);
begin begin
BeginUpdate; if CanConvert then
try begin
Delete(AIndex); BeginUpdate;
finally try
EndUpdate; Delete(AIndex);
end; finally
EndUpdate;
end;
end else
UpdateImageCount;
end; end;
procedure TX2GraphicList.MoveImage(const AOldIndex, ANewIndex: Integer); procedure TX2GraphicList.MoveImage(const AOldIndex, ANewIndex: Integer);
begin begin
BeginUpdate; if CanConvert then
try begin
Move(AOldIndex, ANewIndex); BeginUpdate;
finally try
EndUpdate; Move(AOldIndex, ANewIndex);
finally
EndUpdate;
end;
end; end;
end; end;