fix #563 (Cannot resize the treeview part)
Merge branch '2.x' into 2.1