Merge pull request #6903 from andyque/addConstness

add constness to ui framework
refactor Layout and Widget
Merge pull request #6904 from andyque/refactorUIFramework

refactor Layout and Widget