Rework AnnotPopup parent handling code

The old code was not updating the parent member on setParent
4 files changed