diff --git a/Changes.md b/Changes.md index bbe084b8dda..f4a5171202c 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,11 @@ 1.x.x.x (relative to 1.5.x.x) ======= +Breaking Changes +---------------- + +- StandardNodule : Removed deprecated `setCompatibleLabelsVisible()`. + 1.5.x.x (relative to 1.5.1.0) diff --git a/include/GafferUI/StandardNodule.h b/include/GafferUI/StandardNodule.h index 0eec0acbc17..b215881dcba 100644 --- a/include/GafferUI/StandardNodule.h +++ b/include/GafferUI/StandardNodule.h @@ -89,10 +89,6 @@ class GAFFERUI_API StandardNodule : public Nodule bool dragEnd( GadgetPtr gadget, const DragDropEvent &event ); bool drop( GadgetPtr gadget, const DragDropEvent &event ); - /// \deprecated Use overloaded method without `visible` when setting `visible = true` - /// or `StandardNodeGadget::applyNoduleLabelVisibilityMetadata()` to restore - /// metadata-aware visibility. - void setCompatibleLabelsVisible( const DragDropEvent &event, bool visible ); void setCompatibleLabelsVisible( const DragDropEvent &event ); private : diff --git a/src/GafferUI/StandardNodule.cpp b/src/GafferUI/StandardNodule.cpp index 4e77f77c4bd..892b3bf2dee 100644 --- a/src/GafferUI/StandardNodule.cpp +++ b/src/GafferUI/StandardNodule.cpp @@ -401,10 +401,6 @@ bool StandardNodule::dragLeave( GadgetPtr gadget, const DragDropEvent &event ) { nodeGadget->applyNoduleLabelVisibilityMetadata(); } - else - { - setCompatibleLabelsVisible( event, false ); - } } } else if( NodeGadget *newDestination = IECore::runTimeCast( event.destinationGadget.get() ) ) @@ -415,10 +411,6 @@ bool StandardNodule::dragLeave( GadgetPtr gadget, const DragDropEvent &event ) { nodeGadget->applyNoduleLabelVisibilityMetadata(); } - else - { - setCompatibleLabelsVisible( event, false ); - } } } else @@ -427,10 +419,6 @@ bool StandardNodule::dragLeave( GadgetPtr gadget, const DragDropEvent &event ) { nodeGadget->applyNoduleLabelVisibilityMetadata(); } - else - { - setCompatibleLabelsVisible( event, false ); - } } dirty( DirtyType::Render ); } @@ -459,10 +447,6 @@ bool StandardNodule::drop( GadgetPtr gadget, const DragDropEvent &event ) { nodeGadget->applyNoduleLabelVisibilityMetadata(); } - else - { - setCompatibleLabelsVisible( event, false ); - } if( ConnectionCreator *creator = IECore::runTimeCast( event.sourceGadget.get() ) ) { @@ -479,29 +463,6 @@ bool StandardNodule::drop( GadgetPtr gadget, const DragDropEvent &event ) return false; } -void StandardNodule::setCompatibleLabelsVisible( const DragDropEvent &event, bool visible ) -{ - NodeGadget *nodeGadget = ancestor(); - if( !nodeGadget ) - { - return; - } - - ConnectionCreator *creator = IECore::runTimeCast( event.sourceGadget.get() ); - if( !creator ) - { - return; - } - - for( StandardNodule::RecursiveIterator it( nodeGadget ); !it.done(); ++it ) - { - if( creator->canCreateConnection( it->get()->plug() ) ) - { - (*it)->setLabelVisible( visible ); - } - } -} - void StandardNodule::setCompatibleLabelsVisible( const DragDropEvent &event ) { NodeGadget *nodeGadget = ancestor();