Better behavior when left-clicking a TCO (LMMS#4290)

Instead of calling MouseMoveEvent(), the TCO's "text float" text and position are updated. This prevents left-clicking the right edge of a resizable TCO from decreasing its size. Also, removed an unused variable: m_oldTime
tresf · Apr 11, 2018 · e554a4c · e554a4c
1 parent 00f9590
commit e554a4c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/include/Track.h b/include/Track.h
@@ -290,8 +290,6 @@ protected slots:
 
 	TextFloat * m_hint;
 
-	MidiTime m_oldTime;// used for undo/redo while mouse-button is pressed
-
 // qproperty fields
 	QColor m_mutedColor;
 	QColor m_mutedBackgroundColor;

diff --git a/src/core/Track.cpp b/src/core/Track.cpp
@@ -701,10 +701,8 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me )
 		if( me->x() < width() - RESIZE_GRIP_WIDTH )
 		{
 			m_action = Move;
-			m_oldTime = m_tco->startPosition();
 			QCursor c( Qt::SizeAllCursor );
 			QApplication::setOverrideCursor( c );
-			s_textFloat->setTitle( tr( "Current position" ) );
 			delete m_hint;
 			m_hint = TextFloat::displayMessage( tr( "Hint" ),
 					tr( "Press <%1> and drag to make "
@@ -715,14 +713,18 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me )
 								"Ctrl"),
 								#endif
 					embed::getIconPixmap( "hint" ), 0 );
+			s_textFloat->setTitle( tr( "Current position" ) );
+			s_textFloat->setText( QString( "%1:%2" ).
+					arg( m_tco->startPosition().getTact() + 1 ).
+					arg( m_tco->startPosition().getTicks() %
+							MidiTime::ticksPerTact() ) );
+			s_textFloat->moveGlobal( this, QPoint( width() + 2, height() + 2 ) );
 		}
 		else if( !m_tco->getAutoResize() )
 		{
 			m_action = Resize;
-			m_oldTime = m_tco->length();
 			QCursor c( Qt::SizeHorCursor );
 			QApplication::setOverrideCursor( c );
-			s_textFloat->setTitle( tr( "Current length" ) );
 			delete m_hint;
 			m_hint = TextFloat::displayMessage( tr( "Hint" ),
 					tr( "Press <%1> for free "
@@ -733,10 +735,20 @@ void TrackContentObjectView::mousePressEvent( QMouseEvent * me )
 								"Ctrl"),
 								#endif
 					embed::getIconPixmap( "hint" ), 0 );
+			s_textFloat->setTitle( tr( "Current length" ) );
+			s_textFloat->setText( tr( "%1:%2 (%3:%4 to %5:%6)" ).
+					arg( m_tco->length().getTact() ).
+					arg( m_tco->length().getTicks() %
+							MidiTime::ticksPerTact() ).
+					arg( m_tco->startPosition().getTact() + 1 ).
+					arg( m_tco->startPosition().getTicks() %
+							MidiTime::ticksPerTact() ).
+					arg( m_tco->endPosition().getTact() + 1 ).
+					arg( m_tco->endPosition().getTicks() %
+							MidiTime::ticksPerTact() ) );
+			s_textFloat->moveGlobal( this, QPoint( width() + 2, height() + 2) );
 		}
 //		s_textFloat->reparent( this );
-		// setup text-float as if TCO was already moved/resized
-		mouseMoveEvent( me );
 		s_textFloat->show();
 	}
 	else if( me->button() == Qt::RightButton )
@@ -846,8 +858,7 @@ void TrackContentObjectView::mouseMoveEvent( QMouseEvent * me )
 				arg( m_tco->startPosition().getTact() + 1 ).
 				arg( m_tco->startPosition().getTicks() %
 						MidiTime::ticksPerTact() ) );
-		s_textFloat->moveGlobal( this, QPoint( width() + 2,
-		                                        height() + 2 ) );
+		s_textFloat->moveGlobal( this, QPoint( width() + 2, height() + 2 ) );
 	}
 	else if( m_action == MoveSelection )
 	{
@@ -906,8 +917,7 @@ void TrackContentObjectView::mouseMoveEvent( QMouseEvent * me )
 				arg( m_tco->endPosition().getTact() + 1 ).
 				arg( m_tco->endPosition().getTicks() %
 						MidiTime::ticksPerTact() ) );
-		s_textFloat->moveGlobal( this, QPoint( width() + 2,
-					height() + 2) );
+		s_textFloat->moveGlobal( this, QPoint( width() + 2, height() + 2) );
 	}
 	else
 	{