Merge branch 'master' into digital

This commit is contained in:
pf
2021-07-27 11:29:23 -07:00

View File

@@ -4353,9 +4353,10 @@ MouseOutHandler, MouseWheelHandler {
return;
}
if (mouseElm!=null && ( mouseElm.getHandleGrabbedClose(gx, gy, POSTGRABSQ, MINPOSTGRABSIZE)>=0)) {
if (circuitArea.contains(sx, sy)) {
if (mouseElm!=null && ( mouseElm.getHandleGrabbedClose(gx, gy, POSTGRABSQ, MINPOSTGRABSIZE)>=0)) {
newMouseElm=mouseElm;
} else {
} else {
int bestDist = 100000000;
int bestArea = 100000000;
for (i = 0; i != elmList.size(); i++) {
@@ -4388,6 +4389,7 @@ MouseOutHandler, MouseWheelHandler {
}
}
} // for
}
}
scopeSelected = -1;
if (newMouseElm == null) {