fix contentSize calc to properly use bottomPadding / rightPadding