fixup! Toolbar : Toggle all tools with hotkey

GafferHQ · Nov 8, 2023 · 34a7926 · 34a7926
1 parent 3a8c2fd
commit 34a7926
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/include/GafferUI/View.h b/include/GafferUI/View.h
@@ -189,8 +189,11 @@ class GAFFERUI_API View : public Gaffer::Node
 
 	private :
 
-		void toolsChildAdded( Gaffer::GraphComponent *child ) const;
-		void toolPlugSet( Gaffer::Plug *plug ) const;
+		void toolsChildAdded( Gaffer::GraphComponent *child );
+		void toolPlugSet( Gaffer::Plug *plug );
+
+		using ToolPlugSetMap = std::unordered_map<std::string, Gaffer::Signals::ScopedConnection>;
+		ToolPlugSetMap m_toolPlugSetConnections;
 
 		ViewportGadgetPtr m_viewportGadget;
 		Gaffer::ContextPtr m_context;

diff --git a/src/GafferUI/View.cpp b/src/GafferUI/View.cpp
@@ -254,13 +254,13 @@ void View::registerView( const IECore::TypeId nodeType, const std::string &plugP
 	namedCreators()[nodeType].push_back( RegexAndCreator( boost::regex( plugPath ), creator ) );
 }
 
-void View::toolsChildAdded( Gaffer::GraphComponent *child ) const
+void View::toolsChildAdded( Gaffer::GraphComponent *child )
 {
 	auto tool = static_cast<Tool *>( child ); // Type guaranteed by `ToolContainer::acceptsChild()`
-	tool->plugSetSignal().connect( boost::bind( &View::toolPlugSet, this, ::_1 ) );
+	m_toolPlugSetConnections[tool->getName()] = tool->plugSetSignal().connect( boost::bind( &View::toolPlugSet, this, ::_1 ) );
 }
 
-void View::toolPlugSet( Gaffer::Plug *plug ) const
+void View::toolPlugSet( Gaffer::Plug *plug )
 {
 	auto tool = plug->ancestor<Tool>();
 	if( plug != tool->activePlug() )
@@ -279,23 +279,21 @@ void View::toolPlugSet( Gaffer::Plug *plug ) const
 		{
 			if( t != tool && exclusive( t.get() ) )
 			{
+				// Prevent re-entering `toolPlugSet()` when disabling other exclusive tools
+				Signals::BlockedConnection toolPlugSetBlocker( m_toolPlugSetConnections[t->getName()] );
 				t->activePlug()->setValue( false );
 			}
 		}
 	}
-
-	bool exclusivePlugActive = false;
-	for( auto &t : Tool::Range( *tools() ) )
-	{
-		exclusivePlugActive |= ( exclusive( t.get() ) && t->activePlug()->getValue() );
-	}
-	if( !exclusivePlugActive )
+	else
 	{
 		for( auto &t : Tool::Range( *tools() ) )
 		{
 			auto order = Metadata::value<IntData>( t.get(), "order" );
-			if(  order && order->readable() == 0 )
+			if( order && order->readable() == 0 )
 			{
+				// Prevent re-entering `toolPlugSet()` when enabling the default tool
+				Signals::BlockedConnection toolPlugSetBlocker( m_toolPlugSetConnections[t->getName()] );
 				t->activePlug()->setValue( true );
 				break;
 			}