diff --git a/python/GafferUI/ColorChooser.py b/python/GafferUI/ColorChooser.py index cec4e1e7e6..ade3cf2a93 100644 --- a/python/GafferUI/ColorChooser.py +++ b/python/GafferUI/ColorChooser.py @@ -207,22 +207,6 @@ def valueChangedSignal( self ) : return self.__valueChangedSignal - ## Returns True if a user would expect the specified sequence - # of changes to be merged into one undoable event. - @classmethod - def changesShouldBeMerged( cls, firstReason, secondReason ) : - - if type( firstReason ) != type( secondReason ) : - return False - - return ( firstReason, secondReason ) in ( - # click and drag - ( GafferUI.Slider.ValueChangedReason.Click, GafferUI.Slider.ValueChangedReason.DragBegin ), - ( GafferUI.Slider.ValueChangedReason.DragBegin, GafferUI.Slider.ValueChangedReason.DragMove ), - ( GafferUI.Slider.ValueChangedReason.DragMove, GafferUI.Slider.ValueChangedReason.DragMove ), - ( GafferUI.Slider.ValueChangedReason.DragMove, GafferUI.Slider.ValueChangedReason.DragEnd ), - ) - def __setColorInternal( self, color, staticComponent, reason ) : dragBeginOrEnd = reason in ( GafferUI.Slider.ValueChangedReason.DragBegin, GafferUI.Slider.ValueChangedReason.DragEnd )