BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-07 12:24:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

improve "expand selection" logic

Browse Source
This commit is contained in:
bancika
2020-03-31 09:43:12 +02:00
parent 09e96a03a3
commit a4e448af31
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/presenter/Presenter.java
+22 -9
View File
@@ -2036,29 +2036,42 @@ public class Presenter implements IPlugInPort {
// so don't waste time doing the precise check
if (area.getOutlineArea() != null && selectedArea.getOutlineArea() != null &&
!area.getOutlineArea().getBounds().intersects(selectedArea.getOutlineArea().getBounds()))
continue;
continue;
// create a unified continuity area for both components
Area area1 = new Area();
Area totalArea = new Area();
for (Area a : area.getContinuityPositiveAreas())
area1.add(a);
totalArea.add(a);
if (area.getContinuityNegativeAreas() != null)
for(Area a : area.getContinuityNegativeAreas())
area1.subtract(a);
totalArea.subtract(a);
Area area2 = new Area();
Area totalSelectedArea = new Area();
for (Area a : selectedArea.getContinuityPositiveAreas())
area2.add(a);
totalSelectedArea.add(a);
if (selectedArea.getContinuityNegativeAreas() != null)
for(Area a : selectedArea.getContinuityNegativeAreas())
area2.subtract(a);
totalSelectedArea.subtract(a);
// now check the intersection, if there's something we have a match
area1.intersect(area2);
if (!area1.isEmpty()) {
Area intersection = new Area(totalArea);
intersection.intersect(totalSelectedArea);
if (!intersection.isEmpty()) {
matches = true;
break;
}
// check if one of the sticky points of one components falls on the continuity area of the other
for (int i = 0; i < component.getControlPointCount(); i++)
if (component.isControlPointSticky(i) && totalSelectedArea.contains(component.getControlPoint(i))) {
matches = true;
break;
}
for (int i = 0; i < selectedComponent.getControlPointCount(); i++)
if (selectedComponent.isControlPointSticky(i) && totalArea.contains(selectedComponent.getControlPoint(i))) {
matches = true;
break;
}
}
if (matches) {