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

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