Make the EstimateDrawingSize() simpler
Merge pull request #6067 from raven02/patch-56

Make the EstimateDrawingSize() simpler