update emain-window to do repositioning in a simpler way (#3087)

the old way doesn't buy us anything, so we should just do it in a
straightforward way.