fixed #2072 use Rect.x/y, Rect.width/height replace Rect.origin.x/y, Rect.size.width/height