Fixed scroller preview total item num

Author: FangCunWuChang

src/ui/component/base/Scroller.cpp

@@ -36,9 +36,9 @@ void Scroller::updatePos(double pos, double itemSize) {
 }
 
 void Scroller::paintPreview(juce::Graphics& g,
-	int width, int height, bool vertical) {
+	int width, int height, bool vertical, double totalNum) {
 	if (this->paintPreviewCallback) {
-		this->paintPreviewCallback(g, width, height, vertical);
+		this->paintPreviewCallback(g, width, height, vertical, totalNum);
 	}
 }
 

src/ui/component/base/Scroller.h

@@ -9,7 +9,7 @@ class Scroller : public ScrollerBase {
 	using ItemNumFunc = std::function<double(void)>;
 	using ItemSizeLimitFunc = std::function<std::tuple<double, double>(void)>;
 	using UpdatePosFunc = std::function<void(double, double)>;
-	using PaintPreviewFunc = std::function<void(juce::Graphics&, int, int, bool)>;
+	using PaintPreviewFunc = std::function<void(juce::Graphics&, int, int, bool, double)>;
 	using PaintItemPreviewFunc = std::function<void(juce::Graphics&, int, int, int, bool)>;
 	using PlayPosFunc = std::function<double(void)>;
 
@@ -31,7 +31,7 @@ class Scroller : public ScrollerBase {
 
 	void updatePos(double pos, double itemSize) override;
 
-	void paintPreview(juce::Graphics& g, int width, int height, bool vertical) override;
+	void paintPreview(juce::Graphics& g, int width, int height, bool vertical, double totalNum) override;
 	void paintItemPreview(juce::Graphics& g, int itemIndex,
 		int width, int height, bool vertical) override;
 

src/ui/component/base/ScrollerBase.cpp

@@ -566,7 +566,8 @@ void ScrollerBase::updateBackTemp() {
 
 	/** Paint Preview */
 	this->paintPreview(g,
-		this->getWidth(), this->getHeight(), this->vertical);
+		this->getWidth(), this->getHeight(),
+		this->vertical, this->itemNum);
 
 	/** Paint Item Preview */
 	double itemAreaSize = this->getTrackLength() / this->itemNum;

src/ui/component/base/ScrollerBase.h

@@ -50,7 +50,7 @@ class ScrollerBase : public juce::Component,
 	virtual void updatePos(double pos, double itemSize) = 0;
 
 	virtual void paintPreview(juce::Graphics& g,
-		int width, int height, bool vertical) {};
+		int width, int height, bool vertical, double totalNum) {};
 	virtual void paintItemPreview(juce::Graphics& g, int itemIndex,
 		int width, int height, bool vertical) {};
 

src/ui/component/editor/MIDISourceEditor.cpp

@@ -12,8 +12,8 @@ MIDISourceEditor::MIDISourceEditor() {
 		[this] { return this->getTimeLength(); },
 		[this] { return this->getTimeWidthLimit(); },
 		[this](double pos, double itemSize) { this->updateHPos(pos, itemSize); },
-		[this](juce::Graphics& g, int width, int height, bool vertical) {
-			this->paintNotePreview(g, width, height, vertical); },
+		[this](juce::Graphics& g, int width, int height, bool vertical, double totalNum) {
+			this->paintNotePreview(g, width, height, vertical, totalNum); },
 			Scroller::PaintItemPreviewFunc{},
 			[this] { return this->getPlayPos(); });
 	this->hScroller->setShouldShowPlayPos(true);
@@ -311,18 +311,17 @@ void MIDISourceEditor::updateHPos(double pos, double itemSize) {
 }
 
 void MIDISourceEditor::paintNotePreview(juce::Graphics& g,
-	int width, int height, bool /*vertical*/) {
+	int width, int height, bool /*vertical*/, double totalNum) {
 	/** Size */
 	auto screenSize = utils::getScreenSize(this);
 	float blockRectHeight = screenSize.getHeight() * 0.003;
 
 	/** Blocks */
 	g.setColour(this->trackColor);
-	double totalLength = this->getTimeLength();
 	for (int i = 0; i < this->blockItemTemp.size(); i++) {
 		auto [start, end] = this->blockItemTemp.getUnchecked(i);
-		float startPos = start / totalLength * width;
-		float endPos = end / totalLength * width;
+		float startPos = start / totalNum * width;
+		float endPos = end / totalNum * width;
 
 		juce::Rectangle<float> blockRect(
 			startPos, 0, endPos - startPos, blockRectHeight);

src/ui/component/editor/MIDISourceEditor.h

@@ -53,7 +53,7 @@ class MIDISourceEditor final
 
 	void updateHPos(double pos, double itemSize);
 	void paintNotePreview(juce::Graphics& g,
-		int width, int height, bool vertical);
+		int width, int height, bool vertical, double totalNum);
 
 	int getViewHeight() const;
 	int getKeyNum() const;

src/ui/component/sequencer/SeqView.cpp

@@ -260,8 +260,8 @@ SeqView::SeqView()
 		[this] { return this->getTimeLength(); },
 		[this] { return this->getTimeWidthLimit(); },
 		[this](double pos, double itemSize) { this->updateHPos(pos, itemSize); },
-		[this](juce::Graphics& g, int width, int height, bool vertical) {
-				this->paintBlockPreview(g, width, height, vertical); },
+		[this](juce::Graphics& g, int width, int height, bool vertical, double totalNum) {
+				this->paintBlockPreview(g, width, height, vertical, totalNum); },
 		Scroller::PaintItemPreviewFunc{},
 		[this] { return this->getPlayPos(); });
 	this->hScroller->setShouldShowPlayPos(true);
@@ -891,7 +891,7 @@ void SeqView::updateHPos(double pos, double itemSize) {
 }
 
 void SeqView::paintBlockPreview(juce::Graphics& g,
-	int width, int height, bool /*vertical*/) {
+	int width, int height, bool /*vertical*/, double totalNum) {
 	/** Size */
 	auto screenSize = utils::getScreenSize(this);
 	int paddingHeight = screenSize.getHeight() * 0.0035;
@@ -901,11 +901,10 @@ void SeqView::paintBlockPreview(juce::Graphics& g,
 	float trackHeight = (height - paddingHeight * 2) / (double)(trackNum);
 	trackHeight = std::min(trackHeight, trackMaxHeight);
 
-	double totalLength = this->getTimeLength();
 	for (auto [trackIndex, start, end] : this->blockTemp) {
 		if (trackIndex < trackNum) {
-			float startPos = start / totalLength * width;
-			float endPos = end / totalLength * width;
+			float startPos = start / totalNum * width;
+			float endPos = end / totalNum * width;
 
 			juce::Rectangle<float> blockRect(
 				startPos, paddingHeight + trackIndex * trackHeight,

src/ui/component/sequencer/SeqView.h

@@ -138,7 +138,7 @@ class SeqView final
 
 	void updateHPos(double pos, double itemSize);
 	void paintBlockPreview(juce::Graphics& g,
-		int width, int height, bool vertical);
+		int width, int height, bool vertical, double totalNum);
 
 	int getViewHeight() const;
 	int getTrackNum() const;