Attemp to remove garbage rendering on large samples

khoidauminh · Feb 7, 2025 · b016de8 · b016de8
1 parent 2984f82
commit b016de8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/include/SampleClipView.h b/include/SampleClipView.h
@@ -25,6 +25,7 @@
 #ifndef LMMS_GUI_SAMPLE_CLIP_VIEW_H
 #define LMMS_GUI_SAMPLE_CLIP_VIEW_H
 
+#include <qpoint.h>
 #include "ClipView.h"
 
 #include "SampleThumbnail.h"
@@ -67,6 +68,7 @@ public slots:
 	SampleClip * m_clip;
 	SampleThumbnail m_sampleThumbnail;
 	QPixmap m_paintPixmap;
+	QPoint m_paintPixmapPosition;
 	bool splitClip( const TimePos pos ) override;
 } ;
 

diff --git a/src/gui/clips/SampleClipView.cpp b/src/gui/clips/SampleClipView.cpp
@@ -45,7 +45,8 @@ namespace lmms::gui
 SampleClipView::SampleClipView( SampleClip * _clip, TrackView * _tv ) :
 	ClipView( _clip, _tv ),
 	m_clip( _clip ),
-	m_paintPixmap()
+	m_paintPixmap(),
+	m_paintPixmapPosition()
 {
 	// update UI and tooltip
 	updateSample();
@@ -210,15 +211,15 @@ void SampleClipView::paintEvent( QPaintEvent * pe )
 
 	if( !needsUpdate() )
 	{
-		painter.drawPixmap( 0, 0, m_paintPixmap );
+		painter.drawPixmap(m_paintPixmapPosition, m_paintPixmap);
 		return;
 	}
 
 	setNeedsUpdate( false );
 
 	if (m_paintPixmap.isNull() || m_paintPixmap.size() != size())
 	{
-		m_paintPixmap = QPixmap(size());
+		m_paintPixmap = QPixmap(pe->rect().size());
 	}
 
 	QPainter p( &m_paintPixmap );
@@ -277,9 +278,8 @@ void SampleClipView::paintEvent( QPaintEvent * pe )
 	if (sample.sampleSize() > 0)
 	{
 		const auto param = SampleThumbnail::VisualizeParameters{
-			.sampleRect = QRect(offsetStart, spacing, sampleLength, height() - spacing),
-			.drawRect = QRect(0, spacing, width(), height() - spacing),
-			.viewportRect = pe->rect(),
+			.sampleRect = QRect(offsetStart-pe->rect().x(), spacing, sampleLength, height() - spacing),
+			.viewportRect = QRect(0, 0, pe->rect().width(), pe->rect().height()),
 			.amplification = sample.amplification(),
 			.reversed = sample.reversed()
 		};
@@ -331,8 +331,10 @@ void SampleClipView::paintEvent( QPaintEvent * pe )
 	}*/
 
 	p.end();
+
+	m_paintPixmapPosition = pe->rect().topLeft();
 
-	painter.drawPixmap( 0, 0, m_paintPixmap );
+	painter.drawPixmap(m_paintPixmapPosition.x(), 0, m_paintPixmap);
 }