Piano Roll scroll bar improvement

include/AutomationEditor.h

@@ -40,6 +40,7 @@
 class QPainter;
 class QPixmap;
 class QScrollBar;
+class QGraphicsView;
 
 namespace lmms
 {
@@ -159,6 +160,8 @@ protected slots:
 	/// Updates the clip's quantization using the current user selected value.
 	void setQuantization();
 
+	void updateLeftRightScrollRange();
+
 private:
 
 	enum class Action
@@ -214,8 +217,9 @@ protected slots:
 	void centerTopBottomScroll();
 	void updateTopBottomLevels();
 
-	QScrollBar * m_leftRightScroll;
-	QScrollBar * m_topBottomScroll;
+	QScrollBar* m_leftRightScroll;
+	QScrollBar* m_topBottomScroll;
+	QGraphicsView* m_cornerSquare;
 
 	TimePos m_currentPosition;
 

include/Clip.h

@@ -88,7 +88,7 @@ class LMMS_EXPORT Clip : public Model, public JournallingObject
 		return sp + m_length;
 	}
 
-	inline const TimePos & length() const
+	inline TimePos length() const
 	{
 		return m_length;
 	}
@@ -129,7 +129,7 @@ class LMMS_EXPORT Clip : public Model, public JournallingObject
 	}
 
 	virtual void movePosition( const TimePos & pos );
-	virtual void changeLength( const TimePos & length );
+	virtual void changeLength(TimePos length);
 
 	virtual gui::ClipView * createView( gui::TrackView * tv ) = 0;
 

include/ClipView.h

@@ -73,7 +73,7 @@ class ClipView : public selectableObject, public ModelView
 	ClipView( Clip * clip, TrackView * tv );
 	~ClipView() override;
 
-	bool fixedClips();
+	bool fixedClips() const;
 
 	inline Clip * getClip()
 	{

include/MidiClip.h

@@ -75,6 +75,12 @@ class LMMS_EXPORT MidiClip : public Clip
 		return m_notes;
 	}
 
+	//! Returns exact length (in ticks) instead of length rounded to next bar
+	inline TimePos exactLength() const
+	{
+		return m_exactLength;
+	}
+
 	Note * addStepNote( int step );
 	void setStep( int step, bool enabled );
 
@@ -127,8 +133,6 @@ protected slots:
 
 
 private:
-	TimePos beatClipLength() const;
-
 	void setType( Type _new_clip_type );
 	void checkType();
 
@@ -141,6 +145,7 @@ protected slots:
 	// data-stuff
 	NoteVector m_notes;
 	int m_steps;
+	TimePos m_exactLength = 0;
 
 	MidiClip * adjacentMidiClipByOffset(int offset) const;
 

include/MidiClipView.h

@@ -68,7 +68,7 @@ public slots:
 
 
 protected slots:
-	void openInPianoRoll();
+	void openInPianoRoll(double scrollX = 0.0);
 	void setGhostInPianoRoll();
 
 	void resetName();
@@ -85,6 +85,9 @@ protected slots:
 
 
 private:
+	//! Width in pixels of the area where notes are drawn over the clip
+	float noteAreaWidth() const;
+
 	static QPixmap * s_stepBtnOn0;
 	static QPixmap * s_stepBtnOn200;
 	static QPixmap * s_stepBtnOff;

include/PianoRoll.h

@@ -47,6 +47,7 @@ class QScrollBar;
 class QString;
 class QMenu;
 class QToolButton;
+class QGraphicsView;
 
 namespace lmms
 {
@@ -125,6 +126,7 @@ class PianoRoll : public QWidget
 	void setGhostMidiClip( MidiClip* newMidiClip );
 	void loadGhostNotes( const QDomElement & de );
 	void loadMarkedSemiTones(const QDomElement & de);
+	void setScrollbarPos(double posX); //!< posX is in range [0, 1]
 
 	inline void stopRecording()
 	{
@@ -200,6 +202,7 @@ class PianoRoll : public QWidget
 	// for entering values with dblclick in the vol/pan bars
 	void enterValue( NoteVector* nv );
 
+	void updateXScroll();
 	void updateYScroll();
 
 protected slots:
@@ -249,7 +252,6 @@ protected slots:
 
 	void changeSnapMode();
 
-
 signals:
 	void currentMidiClipChanged();
 	void ghostClipSet(bool);
@@ -372,6 +374,7 @@ protected slots:
 
 	QScrollBar * m_leftRightScroll;
 	QScrollBar * m_topBottomScroll;
+	QGraphicsView* m_cornerSquare;
 
 	TimePos m_currentPosition;
 	bool m_recording;
@@ -540,6 +543,8 @@ class PianoRollWindow : public Editor, SerializingObject
 	QSize sizeHint() const override;
 	bool hasFocus() const;
 
+	void setScrollbarPos(double posX); //!< posX is in range [0, 1]
+
 signals:
 	void currentMidiClipChanged();
 

include/SampleClip.h

@@ -51,7 +51,7 @@ class SampleClip : public Clip
 
 	SampleClip& operator=( const SampleClip& that ) = delete;
 
-	void changeLength( const TimePos & _length ) override;
+	void changeLength(TimePos length) override;
 	const QString & sampleFile() const;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _parent ) override;

include/TrackView.h

@@ -73,7 +73,7 @@ class TrackView : public QWidget, public ModelView, public JournallingObject
 		return m_track;
 	}
 
-	inline TrackContainerView* trackContainerView()
+	inline TrackContainerView* trackContainerView() const
 	{
 		return m_trackContainerView;
 	}

src/core/Clip.cpp

@@ -111,9 +111,9 @@ void Clip::movePosition( const TimePos & pos )
  *  If the clip's length has changed, update it.  We
  *  also add a journal entry for undo and update the display.
  *
- * \param _length The new length of the clip.
+ * \param length The new length of the clip in ticks.
  */
-void Clip::changeLength( const TimePos & length )
+void Clip::changeLength(TimePos length)
 {
 	m_length = length;
 	Engine::getSong()->updateLength();

src/core/SampleClip.cpp

@@ -115,9 +115,9 @@ SampleClip::~SampleClip()
 
 
 
-void SampleClip::changeLength( const TimePos & _length )
+void SampleClip::changeLength(TimePos length)
 {
-	Clip::changeLength(std::max(static_cast<int>(_length), 1));
+	Clip::changeLength(std::max(static_cast<int>(length), 1));
 }
 
 

src/gui/clips/ClipView.cpp

@@ -197,7 +197,7 @@ void ClipView::update()
  *
  * \todo In what circumstance are they fixed?
  */
-bool ClipView::fixedClips()
+bool ClipView::fixedClips() const
 {
 	return m_trackView->trackContainerView()->fixedClips();
 }

src/gui/clips/MidiClipView.cpp

@@ -107,9 +107,10 @@ void MidiClipView::update()
 
 
 
-void MidiClipView::openInPianoRoll()
+void MidiClipView::openInPianoRoll(double scrollX)
 {
-	getGUI()->pianoRoll()->setCurrentMidiClip( m_clip );
+	getGUI()->pianoRoll()->setCurrentMidiClip(m_clip);
+	getGUI()->pianoRoll()->setScrollbarPos(scrollX);
 	getGUI()->pianoRoll()->parentWidget()->show();
 	getGUI()->pianoRoll()->show();
 	getGUI()->pianoRoll()->setFocus();
@@ -313,7 +314,9 @@ void MidiClipView::mouseDoubleClickEvent(QMouseEvent *_me)
 	}
 	if( m_clip->m_clipType == MidiClip::Type::MelodyClip || !fixedClips() )
 	{
-		openInPianoRoll();
+		// Local X position of mouse over clip's note drawing area, normalized to range of [0, 1]
+		const auto scrollX = std::min(_me->localPos().x() / noteAreaWidth(), 1.0);
+		openInPianoRoll(scrollX);
 	}
 }
 
@@ -373,6 +376,11 @@ void MidiClipView::wheelEvent(QWheelEvent * we)
 }
 
 
+float MidiClipView::noteAreaWidth() const
+{
+	return fixedClips() ? parentWidget()->width() - 2 * BORDER_WIDTH : width() - BORDER_WIDTH;
+}
+
 static int computeNoteRange(int minKey, int maxKey)
 {
 	return (maxKey - minKey) + 1;
@@ -447,9 +455,7 @@ void MidiClipView::paintEvent( QPaintEvent * )
 	}
 
 	// Compute pixels per bar
-	const int baseWidth = fixedClips() ? parentWidget()->width() - 2 * BORDER_WIDTH
-						: width() - BORDER_WIDTH;
-	const float pixelsPerBar = baseWidth / (float) m_clip->length().getBar();
+	const float pixelsPerBar = noteAreaWidth() / static_cast<float>(m_clip->length().getBar());
 
 	// Length of one bar/beat in the [0,1] x [0,1] coordinate system
 	const float barLength = 1. / m_clip->length().getBar();

src/gui/editors/AutomationEditor.cpp

@@ -38,6 +38,7 @@
 #include <QScrollBar>
 #include <QStyleOption>
 #include <QToolTip>
+#include <QGraphicsView>
 
 #ifndef __USE_XOPEN
 #define __USE_XOPEN
@@ -158,6 +159,9 @@ AutomationEditor::AutomationEditor() :
 			this, SLOT( updatePosition( const lmms::TimePos& ) ) );
 
 	// init scrollbars
+	m_cornerSquare = new QGraphicsView{this};
+	m_cornerSquare->setSceneRect(0, 0, SCROLLBAR_SIZE, SCROLLBAR_SIZE);
+
 	m_leftRightScroll = new QScrollBar( Qt::Horizontal, this );
 	m_leftRightScroll->setSingleStep( 1 );
 	connect( m_leftRightScroll, SIGNAL(valueChanged(int)), this,
@@ -226,6 +230,7 @@ void AutomationEditor::setCurrentClip(AutomationClip * new_clip )
 	if (m_clip != nullptr)
 	{
 		connect(m_clip, SIGNAL(dataChanged()), this, SLOT(update()));
+		connect(m_clip, &AutomationClip::lengthChanged, this, &AutomationEditor::updateLeftRightScrollRange);
 	}
 
 	emit currentClipChanged();
@@ -1379,16 +1384,6 @@ void AutomationEditor::paintEvent(QPaintEvent * pe )
 					"the context menu of a control!" ) );
 	}
 
-	// TODO: Get this out of paint event
-	int l = validClip() ? (int) m_clip->length() : 0;
-
-	// reset scroll-range
-	if( m_leftRightScroll->maximum() != l )
-	{
-		m_leftRightScroll->setRange( 0, l );
-		m_leftRightScroll->setPageStep( l );
-	}
-
 	if(validClip() && GuiApplication::instance()->automationEditor()->m_editor->hasFocus())
 	{
 		drawCross( p );
@@ -1528,13 +1523,20 @@ void AutomationEditor::centerTopBottomScroll()
 // responsible for moving/resizing scrollbars after window-resizing
 void AutomationEditor::resizeEvent(QResizeEvent * re)
 {
-	m_leftRightScroll->setGeometry( VALUES_WIDTH, height() - SCROLLBAR_SIZE,
-							width() - VALUES_WIDTH,
-							SCROLLBAR_SIZE );
+	m_leftRightScroll->setGeometry(
+		VALUES_WIDTH,
+		height() - SCROLLBAR_SIZE,
+		width() - VALUES_WIDTH - SCROLLBAR_SIZE,
+		SCROLLBAR_SIZE
+	);
 
 	int grid_height = height() - TOP_MARGIN - SCROLLBAR_SIZE;
-	m_topBottomScroll->setGeometry( width() - SCROLLBAR_SIZE, TOP_MARGIN,
-						SCROLLBAR_SIZE, grid_height );
+	m_topBottomScroll->setGeometry(
+		width() - SCROLLBAR_SIZE,
+		TOP_MARGIN,
+		SCROLLBAR_SIZE,
+		grid_height
+	);
 
 	int half_grid = grid_height / 2;
 	int total_pixels = (int)( ( m_maxLevel - m_minLevel ) * m_y_delta + 1 );
@@ -1553,6 +1555,8 @@ void AutomationEditor::resizeEvent(QResizeEvent * re)
 	}
 	centerTopBottomScroll();
 
+	m_cornerSquare->move(width() - SCROLLBAR_SIZE - 1, height() - SCROLLBAR_SIZE - 1);
+
 	if( Engine::getSong() )
 	{
 		Engine::getSong()->getPlayPos( Song::PlayMode::AutomationClip
@@ -1874,6 +1878,17 @@ void AutomationEditor::setQuantization()
 
 
 
+void AutomationEditor::updateLeftRightScrollRange()
+{
+	const int length = validClip() ? static_cast<int>(m_clip->length()) : 0;
+	if (m_leftRightScroll->maximum() != length)
+	{
+		m_leftRightScroll->setRange(0, length);
+		m_leftRightScroll->setPageStep(length);
+	}
+}
+
+
 void AutomationEditor::updateTopBottomLevels()
 {
 	if( m_y_auto )