when height takes left-right borders, and width top-bottom.
And also - Why do we calculate the borders twice - as the call
to CalcWindowSize does this again?

Change-Id: I63a66939bd526a225ccac9bdd6262feba48da5c2