push/pop styles at drawing shape
done
Merge branch 'develop-adding-collapse'