Consistently mark drag-affected shapes

Closes #47