Fix fill misbehaving when drawing was partly outside border (#1865)

Fix fill misbehaving when drawing was partly outside border (#1865) #235