to avoid line height overwrite by caption
fix-testcase-bugs
Merge branch 'fix-testcase-bug' of git://github.com/RaymondChao/zk into 7.0
Merge branch 'update-window' of git://github.com/huangnoah/zk into 7.0
minor tune