Alternative fix for Issue #181

The fix for #181 did not work for me.  So I'm offering this.  There is no functional change.  I just broke out the submethods of onDraw so that we can override them as needed.