Fix length of non-beat clips in the pattern editor

include/SampleClip.h

@@ -95,6 +95,7 @@ public slots:
 	SampleClip( const SampleClip& orig );
 
 private:
+	Track* m_sampleTrack;
 	Sample m_sample;
 	BoolModel m_recordModel;
 	bool m_isPlaying;

src/core/AutomationClip.cpp

@@ -197,6 +197,12 @@ void AutomationClip::updateLength()
 	// checks if it has been resized from either direction.
 	if (getAutoResize())
 	{
+		if ( m_autoTrack != nullptr && m_autoTrack->trackContainer() == Engine::patternStore() )
+		{
+			// If inside a pattern, the clip is always the lenght of it.
+			changeLength(TimePos::ticksPerBar() * Engine::patternStore()->lengthOfPattern(m_autoTrack->getClipNum(this)));
+			return;
+		}
 		// Using 1 bar as the min length for an un-resized clip. 
 		// This does not prevent the user from resizing the clip to be less than a bar later on.
 		changeLength(std::max(TimePos::ticksPerBar(), static_cast<tick_t>(timeMapLength())));

src/core/PatternStore.cpp

@@ -89,7 +89,7 @@ bar_t PatternStore::lengthOfPattern(int pattern) const
 	for (Track * t : tl)
 	{
 		// Don't create Clips here if they don't exist
-		if (pattern < t->numOfClips())
+		if (pattern < t->numOfClips() && t->type() == Track::Type::Instrument)
 		{
 			maxLength = std::max(maxLength, t->getClip(pattern)->length());
 		}

src/core/SampleClip.cpp

@@ -27,6 +27,7 @@
 #include <QDomElement>
 #include <QFileInfo>
 
+#include "PatternStore.h"
 #include "PathUtil.h"
 #include "SampleClipView.h"
 #include "SampleTrack.h"
@@ -37,6 +38,7 @@ namespace lmms
 
 SampleClip::SampleClip(Track* _track, Sample sample, bool isPlaying)
 	: Clip(_track)
+	, m_sampleTrack(_track)
 	, m_sample(std::move(sample))
 	, m_isPlaying(false)
 {
@@ -75,6 +77,7 @@ SampleClip::SampleClip(Track* track)
 
 SampleClip::SampleClip(const SampleClip& orig) :
 	Clip(orig),
+	m_sampleTrack(orig.m_sampleTrack),
 	m_sample(std::move(orig.m_sample)),
 	m_isPlaying(orig.m_isPlaying)
 {
@@ -227,6 +230,11 @@ void SampleClip::updateLength()
 	// If the clip has already been manually resized, don't automatically resize it.
 	if (getAutoResize())
 	{
+		if (m_sampleTrack->trackContainer() == Engine::patternStore())
+		{
+			changeLength(TimePos::ticksPerBar() * Engine::patternStore()->lengthOfPattern(m_sampleTrack->getClipNum(this)));
+			return;
+		}
 		changeLength(sampleLength());
 		setStartTimeOffset(0);
 	}

src/gui/clips/AutomationClipView.cpp

@@ -265,7 +265,7 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 	// pixels per bar
 	const float ppb = fixedClips() ?
 			( parentWidget()->width() - 2 * BORDER_WIDTH )
-				/ (float) m_clip->timeMapLength().getBar() :
+				/ (float) m_clip->length().getBar() :
 								pixelsPerBar();
 
 	const auto min = m_clip->firstObject()->minValue<float>();

src/gui/editors/PatternEditor.cpp

@@ -221,6 +221,13 @@ void PatternEditor::updateMaxSteps()
 			auto mClip = static_cast<MidiClip*>(track->getClip(m_ps->currentPattern()));
 			m_maxClipLength = std::max(m_maxClipLength, static_cast<tick_t>(mClip->length()));
 		}
+		else
+		{
+			// The length of automation and sample clips is updated here.
+			// "Why here ?" will you ask. The answer is: Because.
+			auto clip = track->getClip(m_ps->currentPattern());
+			clip->updateLength();
+		}
 	}
 	updatePixelsPerBar();
 }

src/tracks/MidiClip.cpp

@@ -128,7 +128,7 @@ void MidiClip::updateLength()
 	// If the clip hasn't already been manually resized, automatically resize it.
 	if (getAutoResize())
 	{
-		if (m_clipType == Type::BeatClip)
+		if (m_instrumentTrack->trackContainer()->type() == TrackContainer::Type::Pattern)
 		{
 			changeLength(beatClipLength());
 			updatePatternTrack();