From 8896860c2baf74987f6ed1d0d88b5a8a7f732fdc Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Tue, 23 Jul 2024 16:44:55 -0400
Subject: [PATCH 01/26] Initial Commit

---
 include/PianoRoll.h                |  1 +
 include/TimeLineWidget.h           |  7 +++++++
 src/gui/editors/PianoRoll.cpp      | 16 ++++++++++++++++
 src/gui/editors/TimeLineWidget.cpp | 14 ++++++++++++++
 4 files changed, 38 insertions(+)

diff --git a/include/PianoRoll.h b/include/PianoRoll.h
index 35550a5b32f..fd73339daa2 100644
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -305,6 +305,7 @@ protected slots:
 	~PianoRoll() override = default;
 
 	void autoScroll(const TimePos & t );
+	void continuousAutoScroll(const TimePos & t );
 
 	TimePos newNoteLen() const;
 
diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h
index 5c683cfd9f9..3a08ad3a2c6 100644
--- a/include/TimeLineWidget.h
+++ b/include/TimeLineWidget.h
@@ -140,6 +140,11 @@ class TimeLineWidget : public QWidget
 		return m_autoScroll;
 	}
 
+	AutoScrollState continuousAutoScroll() const
+	{
+		return m_continuousAutoScroll;
+	}
+
 	inline void setPixelsPerBar( float ppb )
 	{
 		m_ppb = ppb;
@@ -168,6 +173,7 @@ public slots:
 		m_snapSize = snapSize;
 	}
 	void toggleAutoScroll( int _n );
+	void toggleContinuousAutoScroll( int _n );
 
 protected:
 	void paintEvent( QPaintEvent * _pe ) override;
@@ -213,6 +219,7 @@ public slots:
 	QCursor m_cursorSelectRight = QCursor{embed::getIconPixmap("cursor_select_right"), 32, 16};
 
 	AutoScrollState m_autoScroll = AutoScrollState::Enabled;
+	AutoScrollState m_continuousAutoScroll = AutoScrollState::Disabled;
 
 	// Width of the unused region on the widget's left (above track labels or piano)
 	int m_xOffset;
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 5811f956cc1..7dbfe3fe361 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -41,6 +41,8 @@
 #include <QStyleOption>
 #include <QToolButton>
 
+#include <QDebug>
+
 #ifndef __USE_XOPEN
 #define __USE_XOPEN
 #endif
@@ -4476,6 +4478,13 @@ void PianoRoll::autoScroll( const TimePos & t )
 	m_scrollBack = false;
 }
 
+void PianoRoll::continuousAutoScroll( const TimePos & t )
+{
+	const int w = width() - m_whiteKeyWidth;
+	//m_leftRightScroll->setValue( t.getTicks() );
+	m_leftRightScroll->setValue( std::max(t.getTicks() - w * TimePos::ticksPerBar() / m_ppb / 2, 0 ) );
+	m_scrollBack = false;
+}
 
 
 
@@ -4488,6 +4497,13 @@ void PianoRoll::updatePosition( const TimePos & t )
 	{
 		autoScroll( t );
 	}
+	if( ( Engine::getSong()->isPlaying()
+			&& Engine::getSong()->playMode() == Song::PlayMode::MidiClip
+			&& m_timeLine->continuousAutoScroll() == TimeLineWidget::AutoScrollState::Enabled
+		) || m_scrollBack )
+	{
+		continuousAutoScroll( t );
+	}
 	// ticks relative to m_currentPosition
 	// < 0 = outside viewport left
 	// > width = outside viewport right
diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp
index 7657e2916cd..3fa0427d1cd 100644
--- a/src/gui/editors/TimeLineWidget.cpp
+++ b/src/gui/editors/TimeLineWidget.cpp
@@ -93,6 +93,14 @@ void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 	autoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) );
 	connect( autoScroll, SIGNAL(changedState(int)), this,
 					SLOT(toggleAutoScroll(int)));
+	// Better Auto Scroll
+
+	auto continuousAutoScroll = new NStateButton(_tool_bar);
+	continuousAutoScroll->setGeneralToolTip( tr( "Continuous auto scrolling" ) );
+	continuousAutoScroll->addState( embed::getIconPixmap( "autoscroll_on" ) );
+	continuousAutoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) );
+	connect( continuousAutoScroll, SIGNAL(changedState(int)), this,
+					SLOT(toggleContinuousAutoScroll(int)));
 
 	auto loopPoints = new NStateButton(_tool_bar);
 	loopPoints->setGeneralToolTip( tr( "Loop points" ) );
@@ -126,6 +134,7 @@ void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 	behaviourAtStop->changeState(static_cast<int>(m_timeline->stopBehaviour()));
 
 	_tool_bar->addWidget( autoScroll );
+	_tool_bar->addWidget( continuousAutoScroll );
 	_tool_bar->addWidget( loopPoints );
 	_tool_bar->addWidget( behaviourAtStop );
 }
@@ -141,6 +150,11 @@ void TimeLineWidget::toggleAutoScroll( int _n )
 	m_autoScroll = static_cast<AutoScrollState>( _n );
 }
 
+void TimeLineWidget::toggleContinuousAutoScroll( int _n )
+{
+	m_continuousAutoScroll = static_cast<AutoScrollState>( _n );
+}
+
 void TimeLineWidget::paintEvent( QPaintEvent * )
 {
 	QPainter p( this );

From 5227bc3a8283da1cc9f3d17e07b04bd0687f8658 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Wed, 24 Jul 2024 17:51:22 -0400
Subject: [PATCH 02/26] Refactor code and add new icons

---
 .../default/autoscroll_continuous_on.png      | Bin 0 -> 7966 bytes
 data/themes/default/autoscroll_stepped_on.png | Bin 0 -> 8791 bytes
 include/PianoRoll.h                           |   1 -
 include/TimeLineWidget.h                      |  11 ++---
 src/gui/editors/PianoRoll.cpp                 |  38 +++++++-----------
 src/gui/editors/SongEditor.cpp                |  23 +++++++----
 src/gui/editors/TimeLineWidget.cpp            |  19 ++-------
 7 files changed, 38 insertions(+), 54 deletions(-)
 create mode 100644 data/themes/default/autoscroll_continuous_on.png
 create mode 100644 data/themes/default/autoscroll_stepped_on.png

diff --git a/data/themes/default/autoscroll_continuous_on.png b/data/themes/default/autoscroll_continuous_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f27a7f7dba81a47bac06508abcf65ee95cc6a6e
GIT binary patch
literal 7966
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
L1phd7e)iu1QwSX@

literal 0
HcmV?d00001

diff --git a/data/themes/default/autoscroll_stepped_on.png b/data/themes/default/autoscroll_stepped_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..c58fa97b2cfe6eb6a0b582b80b7c1d04f45f80c8
GIT binary patch
literal 8791
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
H|4jd1D+9KA

literal 0
HcmV?d00001

diff --git a/include/PianoRoll.h b/include/PianoRoll.h
index fd73339daa2..35550a5b32f 100644
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -305,7 +305,6 @@ protected slots:
 	~PianoRoll() override = default;
 
 	void autoScroll(const TimePos & t );
-	void continuousAutoScroll(const TimePos & t );
 
 	TimePos newNoteLen() const;
 
diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h
index 3a08ad3a2c6..3f399e174b8 100644
--- a/include/TimeLineWidget.h
+++ b/include/TimeLineWidget.h
@@ -73,7 +73,8 @@ class TimeLineWidget : public QWidget
 
 	enum class AutoScrollState
 	{
-		Enabled,
+		Stepped,
+		Continuous,
 		Disabled
 	};
 
@@ -140,11 +141,6 @@ class TimeLineWidget : public QWidget
 		return m_autoScroll;
 	}
 
-	AutoScrollState continuousAutoScroll() const
-	{
-		return m_continuousAutoScroll;
-	}
-
 	inline void setPixelsPerBar( float ppb )
 	{
 		m_ppb = ppb;
@@ -173,7 +169,6 @@ public slots:
 		m_snapSize = snapSize;
 	}
 	void toggleAutoScroll( int _n );
-	void toggleContinuousAutoScroll( int _n );
 
 protected:
 	void paintEvent( QPaintEvent * _pe ) override;
@@ -218,7 +213,7 @@ public slots:
 	QCursor m_cursorSelectLeft = QCursor{embed::getIconPixmap("cursor_select_left"), 0, 16};
 	QCursor m_cursorSelectRight = QCursor{embed::getIconPixmap("cursor_select_right"), 32, 16};
 
-	AutoScrollState m_autoScroll = AutoScrollState::Enabled;
+	AutoScrollState m_autoScroll = AutoScrollState::Stepped;
 	AutoScrollState m_continuousAutoScroll = AutoScrollState::Disabled;
 
 	// Width of the unused region on the widget's left (above track labels or piano)
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 7dbfe3fe361..0e84e98bd22 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -4064,7 +4064,7 @@ void PianoRoll::stop()
 {
 	Engine::getSong()->stop();
 	m_recording = false;
-	m_scrollBack = ( m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Enabled );
+	m_scrollBack = ( m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Disabled );
 }
 
 
@@ -4465,45 +4465,37 @@ bool PianoRoll::deleteSelectedNotes()
 void PianoRoll::autoScroll( const TimePos & t )
 {
 	const int w = width() - m_whiteKeyWidth;
-	if( t > m_currentPosition + w * TimePos::ticksPerBar() / m_ppb )
+	if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped) 
 	{
-		m_leftRightScroll->setValue( t.getBar() * TimePos::ticksPerBar() );
+		if( t > m_currentPosition + w * TimePos::ticksPerBar() / m_ppb )
+		{
+			m_leftRightScroll->setValue( t.getBar() * TimePos::ticksPerBar() );
+		}
+		else if( t < m_currentPosition )
+		{
+			TimePos t2 = qMax( t - w * TimePos::ticksPerBar() *
+						TimePos::ticksPerBar() / m_ppb, (tick_t) 0 );
+			m_leftRightScroll->setValue( t2.getBar() * TimePos::ticksPerBar() );
+		}
 	}
-	else if( t < m_currentPosition )
+	else if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Continuous)
 	{
-		TimePos t2 = qMax( t - w * TimePos::ticksPerBar() *
-					TimePos::ticksPerBar() / m_ppb, (tick_t) 0 );
-		m_leftRightScroll->setValue( t2.getBar() * TimePos::ticksPerBar() );
+		m_leftRightScroll->setValue( std::max(t.getTicks() - w * TimePos::ticksPerBar() / m_ppb / 2, 0 ) );
 	}
 	m_scrollBack = false;
 }
 
-void PianoRoll::continuousAutoScroll( const TimePos & t )
-{
-	const int w = width() - m_whiteKeyWidth;
-	//m_leftRightScroll->setValue( t.getTicks() );
-	m_leftRightScroll->setValue( std::max(t.getTicks() - w * TimePos::ticksPerBar() / m_ppb / 2, 0 ) );
-	m_scrollBack = false;
-}
-
 
 
 void PianoRoll::updatePosition( const TimePos & t )
 {
 	if( ( Engine::getSong()->isPlaying()
 			&& Engine::getSong()->playMode() == Song::PlayMode::MidiClip
-			&& m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Enabled
+			&& m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Disabled
 		) || m_scrollBack )
 	{
 		autoScroll( t );
 	}
-	if( ( Engine::getSong()->isPlaying()
-			&& Engine::getSong()->playMode() == Song::PlayMode::MidiClip
-			&& m_timeLine->continuousAutoScroll() == TimeLineWidget::AutoScrollState::Enabled
-		) || m_scrollBack )
-	{
-		continuousAutoScroll( t );
-	}
 	// ticks relative to m_currentPosition
 	// < 0 = outside viewport left
 	// > width = outside viewport right
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 9ba9ac083d4..a319349ad5b 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -34,6 +34,8 @@
 #include <QSlider>
 #include <QTimeLine>
 
+#include <QDebug>
+
 #include "ActionGroup.h"
 #include "AudioDevice.h"
 #include "AudioEngine.h"
@@ -756,22 +758,29 @@ void SongEditor::updatePosition( const TimePos & t )
 	const auto widgetWidth = compactTrackButtons ? DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT : DEFAULT_SETTINGS_WIDGET_WIDTH;
 	const auto trackOpWidth = compactTrackButtons ? TRACK_OP_WIDTH_COMPACT : TRACK_OP_WIDTH;
 
-	if( ( m_song->isPlaying() && m_song->m_playMode == Song::PlayMode::Song
-		  && m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Enabled) ||
+	if( ( m_song->isPlaying() && m_song->m_playMode == Song::PlayMode::Song ) ||
 							m_scrollBack == true )
 	{
 		m_smoothScroll = ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt();
 		const int w = width() - widgetWidth
 							- trackOpWidth
 							- contentWidget()->verticalScrollBar()->width(); // width of right scrollbar
-		if( t > m_currentPosition + w * TimePos::ticksPerBar() /
-							pixelsPerBar() )
+		
+		if (m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Stepped) 
 		{
-			animateScroll( m_leftRightScroll, t.getBar(), m_smoothScroll );
+			if( t > m_currentPosition + w * TimePos::ticksPerBar() /
+								pixelsPerBar() )
+			{
+				animateScroll( m_leftRightScroll, t.getBar(), m_smoothScroll );
+			}
+			else if( t < m_currentPosition )
+			{
+				animateScroll( m_leftRightScroll, t.getBar(), m_smoothScroll );
+			}
 		}
-		else if( t < m_currentPosition )
+		else if (m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Continuous)
 		{
-			animateScroll( m_leftRightScroll, t.getBar(), m_smoothScroll );
+			animateScroll( m_leftRightScroll, std::max(t.getBar() - w / pixelsPerBar() / 2, 0.0f), m_smoothScroll );
 		}
 		m_scrollBack = false;
 	}
diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp
index 3fa0427d1cd..c5f39dd933b 100644
--- a/src/gui/editors/TimeLineWidget.cpp
+++ b/src/gui/editors/TimeLineWidget.cpp
@@ -87,20 +87,15 @@ void TimeLineWidget::setXOffset(const int x)
 
 void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 {
+	
 	auto autoScroll = new NStateButton(_tool_bar);
 	autoScroll->setGeneralToolTip( tr( "Auto scrolling" ) );
-	autoScroll->addState( embed::getIconPixmap( "autoscroll_on" ) );
+	autoScroll->addState( embed::getIconPixmap( "autoscroll_stepped_on" ) );
+	autoScroll->addState( embed::getIconPixmap( "autoscroll_continuous_on" ) );
 	autoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) );
 	connect( autoScroll, SIGNAL(changedState(int)), this,
 					SLOT(toggleAutoScroll(int)));
-	// Better Auto Scroll
-
-	auto continuousAutoScroll = new NStateButton(_tool_bar);
-	continuousAutoScroll->setGeneralToolTip( tr( "Continuous auto scrolling" ) );
-	continuousAutoScroll->addState( embed::getIconPixmap( "autoscroll_on" ) );
-	continuousAutoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) );
-	connect( continuousAutoScroll, SIGNAL(changedState(int)), this,
-					SLOT(toggleContinuousAutoScroll(int)));
+	
 
 	auto loopPoints = new NStateButton(_tool_bar);
 	loopPoints->setGeneralToolTip( tr( "Loop points" ) );
@@ -134,7 +129,6 @@ void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 	behaviourAtStop->changeState(static_cast<int>(m_timeline->stopBehaviour()));
 
 	_tool_bar->addWidget( autoScroll );
-	_tool_bar->addWidget( continuousAutoScroll );
 	_tool_bar->addWidget( loopPoints );
 	_tool_bar->addWidget( behaviourAtStop );
 }
@@ -150,11 +144,6 @@ void TimeLineWidget::toggleAutoScroll( int _n )
 	m_autoScroll = static_cast<AutoScrollState>( _n );
 }
 
-void TimeLineWidget::toggleContinuousAutoScroll( int _n )
-{
-	m_continuousAutoScroll = static_cast<AutoScrollState>( _n );
-}
-
 void TimeLineWidget::paintEvent( QPaintEvent * )
 {
 	QPainter p( this );

From 82f637034840381bd9bd9ae437546a11e371e6db Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Wed, 24 Jul 2024 18:04:45 -0400
Subject: [PATCH 03/26] Fix logical error

---
 src/gui/editors/SongEditor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index a319349ad5b..1687dc1167f 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -766,7 +766,7 @@ void SongEditor::updatePosition( const TimePos & t )
 							- trackOpWidth
 							- contentWidget()->verticalScrollBar()->width(); // width of right scrollbar
 		
-		if (m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Stepped) 
+		if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped) 
 		{
 			if( t > m_currentPosition + w * TimePos::ticksPerBar() /
 								pixelsPerBar() )
@@ -778,7 +778,7 @@ void SongEditor::updatePosition( const TimePos & t )
 				animateScroll( m_leftRightScroll, t.getBar(), m_smoothScroll );
 			}
 		}
-		else if (m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Continuous)
+		else if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Continuous)
 		{
 			animateScroll( m_leftRightScroll, std::max(t.getBar() - w / pixelsPerBar() / 2, 0.0f), m_smoothScroll );
 		}

From 595c212d59cdba154d99916eb6c6a6e6fc87494f Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:34:46 -0400
Subject: [PATCH 04/26] Add smooth scrolling to Song Editor

---
 include/TrackContentWidget.h          |  2 ++
 src/gui/editors/SongEditor.cpp        | 10 +++++-----
 src/gui/tracks/TrackContentWidget.cpp |  7 ++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h
index f93b0a58d6f..0bad6dbf706 100644
--- a/include/TrackContentWidget.h
+++ b/include/TrackContentWidget.h
@@ -176,6 +176,8 @@ public slots:
 	int m_horizontalWidth;
 	int m_embossWidth;
 
+	TimePos m_song_editor_currentPosition;
+
 	int m_embossOffset;
 } ;
 
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 1687dc1167f..3788fdbe717 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -327,7 +327,7 @@ QString SongEditor::getSnapSizeString() const
 void SongEditor::scrolled( int new_pos )
 {
 	update();
-	emit positionChanged( m_currentPosition = TimePos( new_pos, 0 ) );
+	emit positionChanged( m_currentPosition = TimePos( new_pos ) );
 }
 
 
@@ -715,7 +715,7 @@ void SongEditor::hideMasterPitchFloat( void )
 
 void SongEditor::updateScrollBar( int len )
 {
-	m_leftRightScroll->setMaximum( len );
+	m_leftRightScroll->setMaximum( len * TimePos::ticksPerBar() );
 }
 
 
@@ -771,16 +771,16 @@ void SongEditor::updatePosition( const TimePos & t )
 			if( t > m_currentPosition + w * TimePos::ticksPerBar() /
 								pixelsPerBar() )
 			{
-				animateScroll( m_leftRightScroll, t.getBar(), m_smoothScroll );
+				animateScroll( m_leftRightScroll, t.getTicks(), m_smoothScroll );
 			}
 			else if( t < m_currentPosition )
 			{
-				animateScroll( m_leftRightScroll, t.getBar(), m_smoothScroll );
+				animateScroll( m_leftRightScroll, t.getTicks(), m_smoothScroll );
 			}
 		}
 		else if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Continuous)
 		{
-			animateScroll( m_leftRightScroll, std::max(t.getBar() - w / pixelsPerBar() / 2, 0.0f), m_smoothScroll );
+			animateScroll( m_leftRightScroll, std::max(t.getTicks() - w * TimePos::ticksPerBar() / pixelsPerBar() / 2, 0.0f), m_smoothScroll );
 		}
 		m_scrollBack = false;
 	}
diff --git a/src/gui/tracks/TrackContentWidget.cpp b/src/gui/tracks/TrackContentWidget.cpp
index e205a0c00ea..f0028f6a68e 100644
--- a/src/gui/tracks/TrackContentWidget.cpp
+++ b/src/gui/tracks/TrackContentWidget.cpp
@@ -29,6 +29,8 @@
 #include <QMenu>
 #include <QPainter>
 
+#include <QDebug>
+
 #include "AutomationClip.h"
 #include "Clipboard.h"
 #include "DataFile.h"
@@ -291,7 +293,10 @@ void TrackContentWidget::changePosition( const TimePos & newPos )
 	}
 	setUpdatesEnabled( true );
 
+	m_song_editor_currentPosition = pos;
+
 	// redraw background
+	updateBackground();
 //	update();
 }
 
@@ -629,7 +634,7 @@ void TrackContentWidget::paintEvent( QPaintEvent * pe )
 	if (m_trackView->trackContainerView() != getGUI()->patternEditor()->m_editor)
 	{
 		p.drawTiledPixmap( rect(), m_background, QPoint(
-				tcv->currentPosition().getBar() * ppb, 0 ) );
+				tcv->currentPosition().getTicks() * ppb / TimePos::ticksPerBar(), 0 ) );
 	}
 }
 

From be96a8b779bdee0ce1f21f15976e2b0044b99fef Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:36:39 -0400
Subject: [PATCH 05/26] Remove unused variable

---
 include/TrackContentWidget.h          | 3 ---
 src/gui/tracks/TrackContentWidget.cpp | 2 --
 2 files changed, 5 deletions(-)

diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h
index 0bad6dbf706..77152f2448c 100644
--- a/include/TrackContentWidget.h
+++ b/include/TrackContentWidget.h
@@ -175,9 +175,6 @@ public slots:
 	int m_fineGridWidth;
 	int m_horizontalWidth;
 	int m_embossWidth;
-
-	TimePos m_song_editor_currentPosition;
-
 	int m_embossOffset;
 } ;
 
diff --git a/src/gui/tracks/TrackContentWidget.cpp b/src/gui/tracks/TrackContentWidget.cpp
index f0028f6a68e..66126e29841 100644
--- a/src/gui/tracks/TrackContentWidget.cpp
+++ b/src/gui/tracks/TrackContentWidget.cpp
@@ -293,8 +293,6 @@ void TrackContentWidget::changePosition( const TimePos & newPos )
 	}
 	setUpdatesEnabled( true );
 
-	m_song_editor_currentPosition = pos;
-
 	// redraw background
 	updateBackground();
 //	update();

From 58af412b0353a55d28e09597c714bcf9c877f6a3 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 19:44:59 -0400
Subject: [PATCH 06/26] Fix scrolling speed and scrollbar width

---
 src/gui/editors/SongEditor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 3788fdbe717..c747b49747b 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -236,7 +236,7 @@ SongEditor::SongEditor( Song * song ) :
 	m_leftRightScroll->setMinimum( 0 );
 	m_leftRightScroll->setMaximum( 0 );
 	m_leftRightScroll->setSingleStep( 1 );
-	m_leftRightScroll->setPageStep( 20 );
+	m_leftRightScroll->setPageStep( 20 * TimePos::ticksPerBar() );
 	static_cast<QVBoxLayout *>( layout() )->addWidget( m_leftRightScroll );
 	connect( m_leftRightScroll, SIGNAL(valueChanged(int)),
 					this, SLOT(scrolled(int)));
@@ -547,12 +547,12 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 	else if(abs(we->angleDelta().x()) > abs(we->angleDelta().y())) // scrolling is horizontal
 	{
 		m_leftRightScroll->setValue(m_leftRightScroll->value() -
-							we->angleDelta().x() /30);
+							we->angleDelta().x());
 	}
 	else if(we->modifiers() & Qt::ShiftModifier)
 	{
 		m_leftRightScroll->setValue(m_leftRightScroll->value() -
-							we->angleDelta().y() / 30);
+							we->angleDelta().y());
 	}
 	else
 	{

From ca6aea34f3dbd37796506518c17f7f87ac5eed71 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 19:49:40 -0400
Subject: [PATCH 07/26] Remove QDebug and re-add a newline I deleted in an
 unrelated file

---
 include/TrackContentWidget.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/TrackContentWidget.h b/include/TrackContentWidget.h
index 77152f2448c..f93b0a58d6f 100644
--- a/include/TrackContentWidget.h
+++ b/include/TrackContentWidget.h
@@ -175,6 +175,7 @@ public slots:
 	int m_fineGridWidth;
 	int m_horizontalWidth;
 	int m_embossWidth;
+
 	int m_embossOffset;
 } ;
 

From 518ffb2461104fc4a9956bf10428138217022be4 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 19:56:43 -0400
Subject: [PATCH 08/26] Forgot to add files to commit

---
 src/gui/editors/PianoRoll.cpp         | 2 --
 src/gui/editors/SongEditor.cpp        | 2 --
 src/gui/tracks/TrackContentWidget.cpp | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 0e84e98bd22..2be8a5b0695 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -41,8 +41,6 @@
 #include <QStyleOption>
 #include <QToolButton>
 
-#include <QDebug>
-
 #ifndef __USE_XOPEN
 #define __USE_XOPEN
 #endif
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index c747b49747b..361b839e507 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -34,8 +34,6 @@
 #include <QSlider>
 #include <QTimeLine>
 
-#include <QDebug>
-
 #include "ActionGroup.h"
 #include "AudioDevice.h"
 #include "AudioEngine.h"
diff --git a/src/gui/tracks/TrackContentWidget.cpp b/src/gui/tracks/TrackContentWidget.cpp
index 66126e29841..0465b2f78ee 100644
--- a/src/gui/tracks/TrackContentWidget.cpp
+++ b/src/gui/tracks/TrackContentWidget.cpp
@@ -29,8 +29,6 @@
 #include <QMenu>
 #include <QPainter>
 
-#include <QDebug>
-
 #include "AutomationClip.h"
 #include "Clipboard.h"
 #include "DataFile.h"

From 0ae5a3680b83b2632fbc3554c366240111cc9752 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 21:37:51 -0400
Subject: [PATCH 09/26] Remove unused variable

---
 include/TimeLineWidget.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h
index 3f399e174b8..0eb33bad935 100644
--- a/include/TimeLineWidget.h
+++ b/include/TimeLineWidget.h
@@ -214,7 +214,6 @@ public slots:
 	QCursor m_cursorSelectRight = QCursor{embed::getIconPixmap("cursor_select_right"), 32, 16};
 
 	AutoScrollState m_autoScroll = AutoScrollState::Stepped;
-	AutoScrollState m_continuousAutoScroll = AutoScrollState::Disabled;
 
 	// Width of the unused region on the widget's left (above track labels or piano)
 	int m_xOffset;

From b841fe9223a9f7d74f13d53198b1cf62ab44d88c Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 22:48:28 -0400
Subject: [PATCH 10/26] Fix Styling

---
 src/gui/editors/PianoRoll.cpp         | 22 ++++++++--------
 src/gui/editors/SongEditor.cpp        | 36 +++++++++++++--------------
 src/gui/editors/TimeLineWidget.cpp    | 10 +++-----
 src/gui/tracks/TrackContentWidget.cpp |  4 +--
 4 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 2be8a5b0695..07c718ec9f8 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -4062,7 +4062,7 @@ void PianoRoll::stop()
 {
 	Engine::getSong()->stop();
 	m_recording = false;
-	m_scrollBack = ( m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Disabled );
+	m_scrollBack = (m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Disabled);
 }
 
 
@@ -4465,20 +4465,20 @@ void PianoRoll::autoScroll( const TimePos & t )
 	const int w = width() - m_whiteKeyWidth;
 	if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped) 
 	{
-		if( t > m_currentPosition + w * TimePos::ticksPerBar() / m_ppb )
+		if(t > m_currentPosition + w * TimePos::ticksPerBar() / m_ppb)
 		{
-			m_leftRightScroll->setValue( t.getBar() * TimePos::ticksPerBar() );
+			m_leftRightScroll->setValue(t.getBar() * TimePos::ticksPerBar());
 		}
-		else if( t < m_currentPosition )
+		else if(t < m_currentPosition)
 		{
-			TimePos t2 = qMax( t - w * TimePos::ticksPerBar() *
-						TimePos::ticksPerBar() / m_ppb, (tick_t) 0 );
-			m_leftRightScroll->setValue( t2.getBar() * TimePos::ticksPerBar() );
+			TimePos t2 = qMax(t - w * TimePos::ticksPerBar() *
+						TimePos::ticksPerBar() / m_ppb, (tick_t) 0);
+			m_leftRightScroll->setValue(t2.getBar() * TimePos::ticksPerBar());
 		}
 	}
 	else if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Continuous)
 	{
-		m_leftRightScroll->setValue( std::max(t.getTicks() - w * TimePos::ticksPerBar() / m_ppb / 2, 0 ) );
+		m_leftRightScroll->setValue(std::max(t.getTicks() - w * TimePos::ticksPerBar() / m_ppb / 2, 0));
 	}
 	m_scrollBack = false;
 }
@@ -4487,12 +4487,12 @@ void PianoRoll::autoScroll( const TimePos & t )
 
 void PianoRoll::updatePosition( const TimePos & t )
 {
-	if( ( Engine::getSong()->isPlaying()
+	if((Engine::getSong()->isPlaying()
 			&& Engine::getSong()->playMode() == Song::PlayMode::MidiClip
 			&& m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Disabled
-		) || m_scrollBack )
+		) || m_scrollBack)
 	{
-		autoScroll( t );
+		autoScroll(t);
 	}
 	// ticks relative to m_currentPosition
 	// < 0 = outside viewport left
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 361b839e507..53c33666e4e 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -231,10 +231,10 @@ SongEditor::SongEditor( Song * song ) :
 	static_cast<QVBoxLayout *>( layout() )->insertWidget( 0, m_timeLine );
 
 	m_leftRightScroll = new QScrollBar( Qt::Horizontal, this );
-	m_leftRightScroll->setMinimum( 0 );
-	m_leftRightScroll->setMaximum( 0 );
-	m_leftRightScroll->setSingleStep( 1 );
-	m_leftRightScroll->setPageStep( 20 * TimePos::ticksPerBar() );
+	m_leftRightScroll->setMinimum(0);
+	m_leftRightScroll->setMaximum(0);
+	m_leftRightScroll->setSingleStep(1);
+	m_leftRightScroll->setPageStep(20 * TimePos::ticksPerBar());
 	static_cast<QVBoxLayout *>( layout() )->addWidget( m_leftRightScroll );
 	connect( m_leftRightScroll, SIGNAL(valueChanged(int)),
 					this, SLOT(scrolled(int)));
@@ -325,7 +325,7 @@ QString SongEditor::getSnapSizeString() const
 void SongEditor::scrolled( int new_pos )
 {
 	update();
-	emit positionChanged( m_currentPosition = TimePos( new_pos ) );
+	emit positionChanged(m_currentPosition = TimePos(new_pos));
 }
 
 
@@ -544,13 +544,13 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 	// FIXME: Reconsider if determining orientation is necessary in Qt6.
 	else if(abs(we->angleDelta().x()) > abs(we->angleDelta().y())) // scrolling is horizontal
 	{
-		m_leftRightScroll->setValue(m_leftRightScroll->value() -
-							we->angleDelta().x());
+		m_leftRightScroll->setValue(m_leftRightScroll->value()
+							- we->angleDelta().x() / pixelsPerBar());
 	}
 	else if(we->modifiers() & Qt::ShiftModifier)
 	{
-		m_leftRightScroll->setValue(m_leftRightScroll->value() -
-							we->angleDelta().y());
+		m_leftRightScroll->setValue(m_leftRightScroll->value()
+							- we->angleDelta().y() / pixelsPerBar());
 	}
 	else
 	{
@@ -713,7 +713,7 @@ void SongEditor::hideMasterPitchFloat( void )
 
 void SongEditor::updateScrollBar( int len )
 {
-	m_leftRightScroll->setMaximum( len * TimePos::ticksPerBar() );
+	m_leftRightScroll->setMaximum(len * TimePos::ticksPerBar());
 }
 
 
@@ -756,8 +756,8 @@ void SongEditor::updatePosition( const TimePos & t )
 	const auto widgetWidth = compactTrackButtons ? DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT : DEFAULT_SETTINGS_WIDGET_WIDTH;
 	const auto trackOpWidth = compactTrackButtons ? TRACK_OP_WIDTH_COMPACT : TRACK_OP_WIDTH;
 
-	if( ( m_song->isPlaying() && m_song->m_playMode == Song::PlayMode::Song ) ||
-							m_scrollBack == true )
+	if((m_song->isPlaying() && m_song->m_playMode == Song::PlayMode::Song)
+							|| m_scrollBack == true)
 	{
 		m_smoothScroll = ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt();
 		const int w = width() - widgetWidth
@@ -766,19 +766,19 @@ void SongEditor::updatePosition( const TimePos & t )
 		
 		if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped) 
 		{
-			if( t > m_currentPosition + w * TimePos::ticksPerBar() /
-								pixelsPerBar() )
+			if(t > m_currentPosition + w * TimePos::ticksPerBar()
+								/ pixelsPerBar())
 			{
-				animateScroll( m_leftRightScroll, t.getTicks(), m_smoothScroll );
+				animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
 			}
-			else if( t < m_currentPosition )
+			else if(t < m_currentPosition)
 			{
-				animateScroll( m_leftRightScroll, t.getTicks(), m_smoothScroll );
+				animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
 			}
 		}
 		else if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Continuous)
 		{
-			animateScroll( m_leftRightScroll, std::max(t.getTicks() - w * TimePos::ticksPerBar() / pixelsPerBar() / 2, 0.0f), m_smoothScroll );
+			animateScroll(m_leftRightScroll, std::max(t.getTicks() - w * TimePos::ticksPerBar() / pixelsPerBar() / 2, 0.0f), m_smoothScroll);
 		}
 		m_scrollBack = false;
 	}
diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp
index c5f39dd933b..cb81b0faad3 100644
--- a/src/gui/editors/TimeLineWidget.cpp
+++ b/src/gui/editors/TimeLineWidget.cpp
@@ -87,15 +87,13 @@ void TimeLineWidget::setXOffset(const int x)
 
 void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 {
-	
 	auto autoScroll = new NStateButton(_tool_bar);
-	autoScroll->setGeneralToolTip( tr( "Auto scrolling" ) );
-	autoScroll->addState( embed::getIconPixmap( "autoscroll_stepped_on" ) );
-	autoScroll->addState( embed::getIconPixmap( "autoscroll_continuous_on" ) );
-	autoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) );
+	autoScroll->setGeneralToolTip(tr("Auto scrolling"));
+	autoScroll->addState(embed::getIconPixmap( "autoscroll_stepped_on"));
+	autoScroll->addState(embed::getIconPixmap( "autoscroll_continuous_on"));
+	autoScroll->addState(embed::getIconPixmap( "autoscroll_off"));
 	connect( autoScroll, SIGNAL(changedState(int)), this,
 					SLOT(toggleAutoScroll(int)));
-	
 
 	auto loopPoints = new NStateButton(_tool_bar);
 	loopPoints->setGeneralToolTip( tr( "Loop points" ) );
diff --git a/src/gui/tracks/TrackContentWidget.cpp b/src/gui/tracks/TrackContentWidget.cpp
index 0465b2f78ee..17aaa581b83 100644
--- a/src/gui/tracks/TrackContentWidget.cpp
+++ b/src/gui/tracks/TrackContentWidget.cpp
@@ -629,8 +629,8 @@ void TrackContentWidget::paintEvent( QPaintEvent * pe )
 	// Don't draw background on Pattern Editor
 	if (m_trackView->trackContainerView() != getGUI()->patternEditor()->m_editor)
 	{
-		p.drawTiledPixmap( rect(), m_background, QPoint(
-				tcv->currentPosition().getTicks() * ppb / TimePos::ticksPerBar(), 0 ) );
+		p.drawTiledPixmap(rect(), m_background, QPoint(
+				tcv->currentPosition().getTicks() * ppb / TimePos::ticksPerBar(), 0));
 	}
 }
 

From 426013110e9d750fc2935c878d725cf791d18340 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 22:51:22 -0400
Subject: [PATCH 11/26] Fix Styling Again

---
 src/gui/editors/TimeLineWidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp
index cb81b0faad3..bdde3a66ba4 100644
--- a/src/gui/editors/TimeLineWidget.cpp
+++ b/src/gui/editors/TimeLineWidget.cpp
@@ -89,9 +89,9 @@ void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 {
 	auto autoScroll = new NStateButton(_tool_bar);
 	autoScroll->setGeneralToolTip(tr("Auto scrolling"));
-	autoScroll->addState(embed::getIconPixmap( "autoscroll_stepped_on"));
-	autoScroll->addState(embed::getIconPixmap( "autoscroll_continuous_on"));
-	autoScroll->addState(embed::getIconPixmap( "autoscroll_off"));
+	autoScroll->addState(embed::getIconPixmap("autoscroll_stepped_on"));
+	autoScroll->addState(embed::getIconPixmap("autoscroll_continuous_on"));
+	autoScroll->addState(embed::getIconPixmap("autoscroll_off"));
 	connect( autoScroll, SIGNAL(changedState(int)), this,
 					SLOT(toggleAutoScroll(int)));
 

From ff9ffbf17104d6e450f77443639a3a51b44c0107 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:03:33 -0400
Subject: [PATCH 12/26] Fix Styling Again

---
 src/gui/editors/PianoRoll.cpp  |  8 ++++----
 src/gui/editors/SongEditor.cpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 07c718ec9f8..86441ab0192 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -4465,11 +4465,11 @@ void PianoRoll::autoScroll( const TimePos & t )
 	const int w = width() - m_whiteKeyWidth;
 	if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped) 
 	{
-		if(t > m_currentPosition + w * TimePos::ticksPerBar() / m_ppb)
+		if (t > m_currentPosition + w * TimePos::ticksPerBar() / m_ppb)
 		{
 			m_leftRightScroll->setValue(t.getBar() * TimePos::ticksPerBar());
 		}
-		else if(t < m_currentPosition)
+		else if (t < m_currentPosition)
 		{
 			TimePos t2 = qMax(t - w * TimePos::ticksPerBar() *
 						TimePos::ticksPerBar() / m_ppb, (tick_t) 0);
@@ -4485,9 +4485,9 @@ void PianoRoll::autoScroll( const TimePos & t )
 
 
 
-void PianoRoll::updatePosition( const TimePos & t )
+void PianoRoll::updatePosition(const TimePos & t)
 {
-	if((Engine::getSong()->isPlaying()
+	if ((Engine::getSong()->isPlaying()
 			&& Engine::getSong()->playMode() == Song::PlayMode::MidiClip
 			&& m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Disabled
 		) || m_scrollBack)
diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 53c33666e4e..7b8b97b069c 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -542,12 +542,12 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 	}
 
 	// FIXME: Reconsider if determining orientation is necessary in Qt6.
-	else if(abs(we->angleDelta().x()) > abs(we->angleDelta().y())) // scrolling is horizontal
+	else if (abs(we->angleDelta().x()) > abs(we->angleDelta().y())) // scrolling is horizontal
 	{
 		m_leftRightScroll->setValue(m_leftRightScroll->value()
 							- we->angleDelta().x() / pixelsPerBar());
 	}
-	else if(we->modifiers() & Qt::ShiftModifier)
+	else if (we->modifiers() & Qt::ShiftModifier)
 	{
 		m_leftRightScroll->setValue(m_leftRightScroll->value()
 							- we->angleDelta().y() / pixelsPerBar());
@@ -711,7 +711,7 @@ void SongEditor::hideMasterPitchFloat( void )
 
 
 
-void SongEditor::updateScrollBar( int len )
+void SongEditor::updateScrollBar(int len)
 {
 	m_leftRightScroll->setMaximum(len * TimePos::ticksPerBar());
 }
@@ -766,12 +766,12 @@ void SongEditor::updatePosition( const TimePos & t )
 		
 		if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped) 
 		{
-			if(t > m_currentPosition + w * TimePos::ticksPerBar()
+			if (t > m_currentPosition + w * TimePos::ticksPerBar()
 								/ pixelsPerBar())
 			{
 				animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
 			}
-			else if(t < m_currentPosition)
+			else if (t < m_currentPosition)
 			{
 				animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
 			}

From a73c1b615fd8d13efad14395bfd3cfa5e2e40e1a Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:04:51 -0400
Subject: [PATCH 13/26] Fix Styling Again

---
 src/gui/editors/SongEditor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 7b8b97b069c..808c36724fe 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -756,7 +756,7 @@ void SongEditor::updatePosition( const TimePos & t )
 	const auto widgetWidth = compactTrackButtons ? DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT : DEFAULT_SETTINGS_WIDGET_WIDTH;
 	const auto trackOpWidth = compactTrackButtons ? TRACK_OP_WIDTH_COMPACT : TRACK_OP_WIDTH;
 
-	if((m_song->isPlaying() && m_song->m_playMode == Song::PlayMode::Song)
+	if ((m_song->isPlaying() && m_song->m_playMode == Song::PlayMode::Song)
 							|| m_scrollBack == true)
 	{
 		m_smoothScroll = ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt();

From aa6d4bcb9f5a442d06492eec830a2e372394d199 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:15:56 -0400
Subject: [PATCH 14/26] Add icons for classic theme

---
 .../themes/classic/autoscroll_continuous_on.png | Bin 0 -> 9733 bytes
 data/themes/classic/autoscroll_stepped_on.png   | Bin 0 -> 11905 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 data/themes/classic/autoscroll_continuous_on.png
 create mode 100644 data/themes/classic/autoscroll_stepped_on.png

diff --git a/data/themes/classic/autoscroll_continuous_on.png b/data/themes/classic/autoscroll_continuous_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..0140d5cc51733dd1475c2b9d3cb7b8f4b32ba4db
GIT binary patch
literal 9733
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
aJ81Mni7)1u?+tEJjm6lQ7j4^j^uGW}iTEr4

literal 0
HcmV?d00001

diff --git a/data/themes/classic/autoscroll_stepped_on.png b/data/themes/classic/autoscroll_stepped_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..e54489f7a1d7b2fa92d5e1b03d9e82c84fd3cd9e
GIT binary patch
literal 11905
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
U&Y);L+HjjuHgC)}+<x$X0L7=QJpcdz

literal 0
HcmV?d00001


From 0a16a930a9970eaecfba445e7dbb8b515af9c3d2 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Thu, 25 Jul 2024 23:34:36 -0400
Subject: [PATCH 15/26] Accidentally committed varying scroll speed with zoom
 -- removing

---
 src/gui/editors/SongEditor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 808c36724fe..ef402717dae 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -545,12 +545,12 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 	else if (abs(we->angleDelta().x()) > abs(we->angleDelta().y())) // scrolling is horizontal
 	{
 		m_leftRightScroll->setValue(m_leftRightScroll->value()
-							- we->angleDelta().x() / pixelsPerBar());
+							- we->angleDelta().x());
 	}
 	else if (we->modifiers() & Qt::ShiftModifier)
 	{
 		m_leftRightScroll->setValue(m_leftRightScroll->value()
-							- we->angleDelta().y() / pixelsPerBar());
+							- we->angleDelta().y());
 	}
 	else
 	{
@@ -764,7 +764,7 @@ void SongEditor::updatePosition( const TimePos & t )
 							- trackOpWidth
 							- contentWidget()->verticalScrollBar()->width(); // width of right scrollbar
 		
-		if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped) 
+		if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped)
 		{
 			if (t > m_currentPosition + w * TimePos::ticksPerBar()
 								/ pixelsPerBar())

From 87ab27634f47921236de6dfa6c1cbda22c985d3b Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:43:07 -0400
Subject: [PATCH 16/26] Change abs to std::abs

Co-authored-by: saker <sakertooth@gmail.com>
---
 src/gui/editors/SongEditor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index ef402717dae..8b6f61e1c1e 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -542,7 +542,7 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 	}
 
 	// FIXME: Reconsider if determining orientation is necessary in Qt6.
-	else if (abs(we->angleDelta().x()) > abs(we->angleDelta().y())) // scrolling is horizontal
+	else if (std::abs(we->angleDelta().x()) > std::abs(we->angleDelta().y())) // scrolling is horizontal
 	{
 		m_leftRightScroll->setValue(m_leftRightScroll->value()
 							- we->angleDelta().x());

From e0fd0665898028c431685ef439148affcf961b3e Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:44:04 -0400
Subject: [PATCH 17/26] Change qMax to std::max and use static_cast

Co-authored-by: saker <sakertooth@gmail.com>
---
 src/gui/editors/PianoRoll.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 86441ab0192..067f370b084 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -4471,8 +4471,8 @@ void PianoRoll::autoScroll( const TimePos & t )
 		}
 		else if (t < m_currentPosition)
 		{
-			TimePos t2 = qMax(t - w * TimePos::ticksPerBar() *
-						TimePos::ticksPerBar() / m_ppb, (tick_t) 0);
+			TimePos t2 = std::max(t - w * TimePos::ticksPerBar() *
+						TimePos::ticksPerBar() / m_ppb, static_cast<tick_t>(0));
 			m_leftRightScroll->setValue(t2.getBar() * TimePos::ticksPerBar());
 		}
 	}

From d75598784900abcdb9baa2a367347445a0713d6f Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Fri, 26 Jul 2024 10:45:01 -0400
Subject: [PATCH 18/26] Simplify stepped auto scrolling

Co-authored-by: saker <sakertooth@gmail.com>
---
 src/gui/editors/SongEditor.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 8b6f61e1c1e..971c4fa51d0 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -766,15 +766,9 @@ void SongEditor::updatePosition( const TimePos & t )
 		
 		if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped)
 		{
-			if (t > m_currentPosition + w * TimePos::ticksPerBar()
-								/ pixelsPerBar())
-			{
-				animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
-			}
-			else if (t < m_currentPosition)
-			{
-				animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
-			}
+			const auto nextPosition = m_currentPosition + w * TimePos::ticksPerBar() / pixelsPerBar();
+			if (t <= nextPosition && t >= m_currentPosition) { return; }
+			animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
 		}
 		else if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Continuous)
 		{

From cd80974a0f832d7ac6c07926d5af55cafab35f37 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:05:47 -0400
Subject: [PATCH 19/26] Remove unnecessary parentheses

---
 src/gui/editors/PianoRoll.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 067f370b084..22400edce49 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -4062,7 +4062,7 @@ void PianoRoll::stop()
 {
 	Engine::getSong()->stop();
 	m_recording = false;
-	m_scrollBack = (m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Disabled);
+	m_scrollBack = m_timeLine->autoScroll() != TimeLineWidget::AutoScrollState::Disabled;
 }
 
 

From 4151b2f70a2e3a5c3c1bc1132d6894c37b5ccec3 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:48:15 -0400
Subject: [PATCH 20/26] Remove return statement causing the play head line to
 stop

---
 src/gui/editors/SongEditor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 971c4fa51d0..3fb395548e4 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -767,8 +767,10 @@ void SongEditor::updatePosition( const TimePos & t )
 		if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Stepped)
 		{
 			const auto nextPosition = m_currentPosition + w * TimePos::ticksPerBar() / pixelsPerBar();
-			if (t <= nextPosition && t >= m_currentPosition) { return; }
-			animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
+			if (t > nextPosition || t < m_currentPosition) 
+			{
+				animateScroll(m_leftRightScroll, t.getTicks(), m_smoothScroll);
+			}
 		}
 		else if (m_timeLine->autoScroll() == TimeLineWidget::AutoScrollState::Continuous)
 		{

From 84cfbda219b460e0c3a3a3dab359904182707498 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Fri, 26 Jul 2024 12:24:07 -0400
Subject: [PATCH 21/26] Add specific tooltips to auto scrolling button states

---
 src/gui/editors/TimeLineWidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp
index bdde3a66ba4..bc0f6c8842c 100644
--- a/src/gui/editors/TimeLineWidget.cpp
+++ b/src/gui/editors/TimeLineWidget.cpp
@@ -89,9 +89,9 @@ void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 {
 	auto autoScroll = new NStateButton(_tool_bar);
 	autoScroll->setGeneralToolTip(tr("Auto scrolling"));
-	autoScroll->addState(embed::getIconPixmap("autoscroll_stepped_on"));
-	autoScroll->addState(embed::getIconPixmap("autoscroll_continuous_on"));
-	autoScroll->addState(embed::getIconPixmap("autoscroll_off"));
+	autoScroll->addState(embed::getIconPixmap("autoscroll_stepped_on"), "Stepped auto scrolling");
+	autoScroll->addState(embed::getIconPixmap("autoscroll_continuous_on"), "Continuous auto scrolling");
+	autoScroll->addState(embed::getIconPixmap("autoscroll_off"), "Auto scrolling disabled");
 	connect( autoScroll, SIGNAL(changedState(int)), this,
 					SLOT(toggleAutoScroll(int)));
 

From 0017d2717761d5b3329f0003ccfabd4f5ebe85ca Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Fri, 26 Jul 2024 12:31:35 -0400
Subject: [PATCH 22/26] Remove `== true` from SongEditor.cpp

Co-authored-by: saker <sakertooth@gmail.com>
---
 src/gui/editors/SongEditor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 3fb395548e4..5e90ef1ad2b 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -757,7 +757,7 @@ void SongEditor::updatePosition( const TimePos & t )
 	const auto trackOpWidth = compactTrackButtons ? TRACK_OP_WIDTH_COMPACT : TRACK_OP_WIDTH;
 
 	if ((m_song->isPlaying() && m_song->m_playMode == Song::PlayMode::Song)
-							|| m_scrollBack == true)
+							|| m_scrollBack)
 	{
 		m_smoothScroll = ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt();
 		const int w = width() - widgetWidth

From 1a4c7918e19bed1e9eccba9ac0d332aaa6232c61 Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Fri, 26 Jul 2024 12:34:28 -0400
Subject: [PATCH 23/26] Make tooltips translatable

Co-authored-by: Dominic Clark <mrdomclark@gmail.com>
---
 src/gui/editors/TimeLineWidget.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/editors/TimeLineWidget.cpp b/src/gui/editors/TimeLineWidget.cpp
index bc0f6c8842c..f75b1cabfac 100644
--- a/src/gui/editors/TimeLineWidget.cpp
+++ b/src/gui/editors/TimeLineWidget.cpp
@@ -89,9 +89,9 @@ void TimeLineWidget::addToolButtons( QToolBar * _tool_bar )
 {
 	auto autoScroll = new NStateButton(_tool_bar);
 	autoScroll->setGeneralToolTip(tr("Auto scrolling"));
-	autoScroll->addState(embed::getIconPixmap("autoscroll_stepped_on"), "Stepped auto scrolling");
-	autoScroll->addState(embed::getIconPixmap("autoscroll_continuous_on"), "Continuous auto scrolling");
-	autoScroll->addState(embed::getIconPixmap("autoscroll_off"), "Auto scrolling disabled");
+	autoScroll->addState(embed::getIconPixmap("autoscroll_stepped_on"), tr("Stepped auto scrolling"));
+	autoScroll->addState(embed::getIconPixmap("autoscroll_continuous_on"), tr("Continuous auto scrolling"));
+	autoScroll->addState(embed::getIconPixmap("autoscroll_off"), tr("Auto scrolling disabled"));
 	connect( autoScroll, SIGNAL(changedState(int)), this,
 					SLOT(toggleAutoScroll(int)));
 

From def4fa6dd49ecf42d109473e45111147e49327dc Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Mon, 29 Jul 2024 22:46:10 -0400
Subject: [PATCH 24/26] Fix zooming position calculation

---
 src/gui/editors/SongEditor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 5e90ef1ad2b..955245d73df 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -523,7 +523,7 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 	{
 		int x = position(we).x() - m_trackHeadWidth;
 		// bar based on the mouse x-position where the scroll wheel was used
-		int bar = x / pixelsPerBar();
+		int bar = x / pixelsPerBar() * TimePos::ticksPerBar();
 
 		// move zoom slider (pixelsPerBar will change automatically)
 		int step = we->modifiers() & Qt::ShiftModifier ? 1 : 5;
@@ -532,7 +532,7 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 		m_zoomingModel->incValue(step * direction);
 
 		// scroll to zooming around cursor's bar
-		int newBar = static_cast<int>(x / pixelsPerBar());
+		int newBar = static_cast<int>(x / pixelsPerBar() * TimePos::ticksPerBar());
 		m_leftRightScroll->setValue(m_leftRightScroll->value() + bar - newBar);
 
 		// update timeline

From 80643b0da9749584d468646afce7dd27daf00f6b Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Mon, 29 Jul 2024 22:52:14 -0400
Subject: [PATCH 25/26] Rename bars to ticks

---
 src/gui/editors/SongEditor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 955245d73df..2befc742f1f 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -522,8 +522,8 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 	if ((we->modifiers() & Qt::ControlModifier) && (position(we).x() > m_trackHeadWidth))
 	{
 		int x = position(we).x() - m_trackHeadWidth;
-		// bar based on the mouse x-position where the scroll wheel was used
-		int bar = x / pixelsPerBar() * TimePos::ticksPerBar();
+		// tick based on the mouse x-position where the scroll wheel was used
+		int tick = x / pixelsPerBar() * TimePos::ticksPerBar();
 
 		// move zoom slider (pixelsPerBar will change automatically)
 		int step = we->modifiers() & Qt::ShiftModifier ? 1 : 5;
@@ -531,9 +531,9 @@ void SongEditor::wheelEvent( QWheelEvent * we )
 		int direction = (we->angleDelta().y() + we->angleDelta().x()) > 0 ? 1 : -1;
 		m_zoomingModel->incValue(step * direction);
 
-		// scroll to zooming around cursor's bar
-		int newBar = static_cast<int>(x / pixelsPerBar() * TimePos::ticksPerBar());
-		m_leftRightScroll->setValue(m_leftRightScroll->value() + bar - newBar);
+		// scroll to zooming around cursor's tick
+		int newTick = static_cast<int>(x / pixelsPerBar() * TimePos::ticksPerBar());
+		m_leftRightScroll->setValue(m_leftRightScroll->value() + tick - newTick);
 
 		// update timeline
 		m_timeLine->setPixelsPerBar(pixelsPerBar());

From 9bfcea7e7c15eb3e11a2b275a6a6da42b2a5c77b Mon Sep 17 00:00:00 2001
From: regulus79 <117475203+regulus79@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:24:36 -0400
Subject: [PATCH 26/26] Fix rubberband rect size

---
 src/gui/editors/SongEditor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp
index 2befc742f1f..f043e715acc 100644
--- a/src/gui/editors/SongEditor.cpp
+++ b/src/gui/editors/SongEditor.cpp
@@ -384,7 +384,7 @@ void SongEditor::updateRubberband()
 		}
 
 		//take care of the scrollbar position
-		int hs = (m_leftRightScroll->value() - m_scrollPos.x()) * pixelsPerBar();
+		int hs = (m_leftRightScroll->value() - m_scrollPos.x()) * pixelsPerBar() / TimePos::ticksPerBar();
 		int vs = contentWidget()->verticalScrollBar()->value() - m_scrollPos.y();
 
 		//the adjusted origin point