From 9d3b506415f710a144c8b2ca42a4ef29dc3dc1a0 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Tue, 16 Sep 2008 22:32:25 +0000
Subject: [PATCH] * fixed cloning of automation-patterns (closes #2102218) *
 allow dropping automation patterns onto existing automation patterns

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1618 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                       |  5 +++++
 src/core/automation_pattern.cpp | 21 +++++++++++++++------
 src/core/track.cpp              |  2 ++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13ffc32ba..f540a26c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-16	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/core/track.cpp:
+	* src/core/automation_pattern.cpp:
+	- fixed cloning of automation-patterns (closes #2102218)
+	- allow dropping automation patterns onto existing automation patterns
+
 	* src/core/project_journal.cpp:
 	improved usage of random number generator (closes #2109211)
 
diff --git a/src/core/automation_pattern.cpp b/src/core/automation_pattern.cpp
index 83cc35a93..15be55746 100644
--- a/src/core/automation_pattern.cpp
+++ b/src/core/automation_pattern.cpp
@@ -761,6 +761,10 @@ void automationPatternView::paintEvent( QPaintEvent * )
 void automationPatternView::dragEnterEvent( QDragEnterEvent * _dee )
 {
 	stringPairDrag::processDragEnterEvent( _dee, "automatable_model" );
+	if( !_dee->isAccepted() )
+	{
+		trackContentObjectView::dragEnterEvent( _dee );
+	}
 }
 
 
@@ -779,14 +783,19 @@ void automationPatternView::dropEvent( QDropEvent * _de )
 		{
 			m_pat->addObject( mod );
 		}
+		update();
+
+		if( engine::getAutomationEditor() &&
+			engine::getAutomationEditor()->currentPattern() ==
+									m_pat )
+		{
+			engine::getAutomationEditor()->setCurrentPattern(
+									m_pat );
+		}
 	}
-
-	update();
-
-	if( engine::getAutomationEditor() &&
-		engine::getAutomationEditor()->currentPattern() == m_pat )
+	else
 	{
-		engine::getAutomationEditor()->setCurrentPattern( m_pat );
+		trackContentObjectView::dropEvent( _de );
 	}
 }
 
diff --git a/src/core/track.cpp b/src/core/track.cpp
index 4fff711e4..6320814d9 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -492,6 +492,7 @@ void trackContentObjectView::dropEvent( QDropEvent * _de )
 		midiTime pos = m_tco->startPosition();
 		m_tco->restoreState( mmp.content().firstChild().toElement() );
 		m_tco->movePosition( pos );
+		automationPattern::resolveAllIDs();
 		_de->accept();
 	}
 }
@@ -1083,6 +1084,7 @@ void trackContentWidget::dropEvent( QDropEvent * _de )
 		tco->restoreState( mmp.content().firstChild().toElement() );
 		tco->movePosition( pos );
 
+		automationPattern::resolveAllIDs();
 
 		_de->accept();
 	}