am 80c69853: simplifying code to prevent drawing off-screen

* commit '80c69853d64b73e5d62ed33bea1b10680557ee3e':
  simplifying code to prevent drawing off-screen