Added Select/Cancel Buttons to ColorPicker

Allows the user to either select a color or cancel the selection (both
result in closing the ColorPicker). The ColorSwatch will only repaint if
a color is selected.