修改半隐藏时，窗口自动适应
Merge branches 'master' and 'dev'