fixes: some fixes in logic editor in dropping blocks functionality

Innovative-CST · Dec 30, 2024 · 30db870 · 30db870
1 parent e7142e7
commit 30db870
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/logiceditor/src/main/java/com/icst/logic/editor/view/LogicEditorView.java b/logiceditor/src/main/java/com/icst/logic/editor/view/LogicEditorView.java
@@ -236,10 +236,16 @@ public void dropBlock(float x, float y) {
 
 				ActionBlockDropZoneView newZone = new ActionBlockDropZoneView(
 						getContext(), new LogicEditorConfiguration(), this);
+
+				LogicEditorCanvaView.LayoutParams lp = new LogicEditorCanvaView.LayoutParams(
+						LogicEditorCanvaView.LayoutParams.WRAP_CONTENT,
+						LogicEditorCanvaView.LayoutParams.WRAP_CONTENT);
+
 				newZone.addActionBlocksBeans(blocks, 0);
 				newZone.setX(x);
 				newZone.setY(y);
 				getLogicEditorCanva().addView(newZone);
+				newZone.setLayoutParams(lp);
 				blockDropZones.add(newZone);
 
 			} else if (draggingBean instanceof ActionBlockBean block) {
@@ -249,10 +255,16 @@ public void dropBlock(float x, float y) {
 
 				ActionBlockDropZoneView newZone = new ActionBlockDropZoneView(
 						getContext(), new LogicEditorConfiguration(), this);
+
+				LogicEditorCanvaView.LayoutParams lp = new LogicEditorCanvaView.LayoutParams(
+						LogicEditorCanvaView.LayoutParams.WRAP_CONTENT,
+						LogicEditorCanvaView.LayoutParams.WRAP_CONTENT);
+
 				newZone.addActionBlocksBeans(blocks, 0);
 				newZone.setX(x);
 				newZone.setY(y);
 				getLogicEditorCanva().addView(newZone);
+				newZone.setLayoutParams(lp);
 				blockDropZones.add(newZone);
 			}
 		}
@@ -280,7 +292,7 @@ public void removeOldReferences() {
 			} else if (parent instanceof ActionBlockDropZoneView regularChain) {
 				int index = regularChain.indexOfChild(actionBlockBeanView);
 				regularChain.getChildAt(index).setOnTouchListener(null);
-				regularChain.removeViews(index, regularChain.getBlocksSize() - index);
+				regularChain.removeViews(index, regularChain.getChildCount() - index);
 				regularChain.dereferenceActionBlocks(index);
 			}
 		}

diff --git a/logiceditor/src/main/java/com/icst/logic/lib/view/ActionBlockDropZoneView.java b/logiceditor/src/main/java/com/icst/logic/lib/view/ActionBlockDropZoneView.java
@@ -77,7 +77,8 @@ public boolean isTerminated() {
 	}
 
 	public void dereferenceActionBlocks(int index) {
-		for (int i = index; i <= blockBeans.size(); ++i) {
+		int numberOfBlocks = blockBeans.size();
+		for (int i = index; i < numberOfBlocks; ++i) {
 			blockBeans.remove(index);
 		}
 	}

diff --git a/logiceditor/src/main/java/com/icst/logic/lib/view/MainActionBlockDropZoneView.java b/logiceditor/src/main/java/com/icst/logic/lib/view/MainActionBlockDropZoneView.java
@@ -101,7 +101,8 @@ public boolean isTerminated() {
 	}
 
 	public void dereferenceActionBlocks(int index) {
-		for (int i = index; i <= blockBeans.size(); ++i) {
+		int numberOfBlocks = blockBeans.size();
+		for (int i = index; i < numberOfBlocks; ++i) {
 			blockBeans.remove(index);
 		}
 	}