PathColumn : ABI compatibility workaround

This avoids adding new member variables to PathColumn for Gaffer 1.5 and should be reverted on main.
GafferHQ · Feb 5, 2025 · c952758 · c952758
1 parent 78d2e64
commit c952758
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/include/GafferUI/PathColumn.h b/include/GafferUI/PathColumn.h
@@ -78,6 +78,7 @@ class GAFFERUI_API PathColumn : public IECore::RefCounted, public Gaffer::Signal
 		};
 
 		explicit PathColumn( SizeMode sizeMode = Default );
+		~PathColumn();
 
 		/// Returns the current column size mode.
 		SizeMode getSizeMode() const;
@@ -199,11 +200,6 @@ class GAFFERUI_API PathColumn : public IECore::RefCounted, public Gaffer::Signal
 		ContextMenuSignal m_contextMenuSignal;
 		KeySignal m_keyPressSignal;
 		KeySignal m_keyReleaseSignal;
-		DragDropSignal m_dragEnterSignal;
-		DragDropSignal m_dragMoveSignal;
-		DragDropSignal m_dragLeaveSignal;
-		DragDropSignal m_dropSignal;
-		DragDropSignal m_dragEndSignal;
 
 		SizeMode m_sizeMode;
 

diff --git a/src/GafferUI/PathColumn.cpp b/src/GafferUI/PathColumn.cpp
@@ -47,6 +47,9 @@
 
 #include "fmt/format.h"
 
+#include <memory>
+#include <unordered_map>
+
 using namespace IECore;
 using namespace Gaffer;
 using namespace GafferUI;
@@ -69,6 +72,12 @@ const std::string basisName( StandardCubicBasis basis )
 	return "Unknown";
 }
 
+std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dragEnterSignals;
+std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dragMoveSignals;
+std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dragLeaveSignals;
+std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dropSignals;
+std::unordered_map<const PathColumn *, std::unique_ptr<PathColumn::DragDropSignal>> g_dragEndSignals;
+
 }  // namespace
 
 //////////////////////////////////////////////////////////////////////////
@@ -78,6 +87,20 @@ const std::string basisName( StandardCubicBasis basis )
 PathColumn::PathColumn( SizeMode sizeMode )
 	:	m_sizeMode( sizeMode )
 {
+	g_dragEnterSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
+	g_dragMoveSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
+	g_dragLeaveSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
+	g_dropSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
+	g_dragEndSignals[this] = std::make_unique<PathColumn::DragDropSignal>();
+}
+
+PathColumn::~PathColumn()
+{
+	g_dragEnterSignals.erase( this );
+	g_dragMoveSignals.erase( this );
+	g_dragLeaveSignals.erase( this );
+	g_dropSignals.erase( this );
+	g_dragEndSignals.erase( this );
 }
 
 PathColumn::SizeMode PathColumn::getSizeMode() const
@@ -127,27 +150,27 @@ PathColumn::KeySignal &PathColumn::keyReleaseSignal()
 
 PathColumn::DragDropSignal &PathColumn::dragEnterSignal()
 {
-	return m_dragEnterSignal;
+	return *( g_dragEnterSignals[this] );
 }
 
 PathColumn::DragDropSignal &PathColumn::dragMoveSignal()
 {
-	return m_dragMoveSignal;
+	return *( g_dragMoveSignals[this] );
 }
 
 PathColumn::DragDropSignal &PathColumn::dragLeaveSignal()
 {
-	return m_dragLeaveSignal;
+	return *( g_dragLeaveSignals[this] );
 }
 
 PathColumn::DragDropSignal &PathColumn::dropSignal()
 {
-	return m_dropSignal;
+	return *( g_dropSignals[this] );
 }
 
 PathColumn::DragDropSignal &PathColumn::dragEndSignal()
 {
-	return m_dragEndSignal;
+	return *( g_dragEndSignals[this] );
 }
 
 PathColumn::PathColumnSignal &PathColumn::instanceCreatedSignal()