Move border rendering logic into widget library.