expand clipping rectangle to account for offset (#4554)

also adresses cleaner defines for single-sided offsets from #4716