Merge pull request #1712 from curlymorphic/i1532

Proposed fix for #1532 Tracks in song editor cannot be moved in pattern ...
This commit is contained in:
Tres Finocchiaro
2015-01-28 20:37:03 -05:00

View File

@@ -2615,7 +2615,11 @@ void TrackView::mousePressEvent( QMouseEvent * _me )
}
if( m_trackContainerView->allowRubberband() == true )
int widgetTotal = ConfigManager::inst()->value( "ui",
"compacttrackbuttons" ).toInt()==1 ?
DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + TRACK_OP_WIDTH_COMPACT :
DEFAULT_SETTINGS_WIDGET_WIDTH + TRACK_OP_WIDTH;
if( m_trackContainerView->allowRubberband() == true && _me->x() > widgetTotal )
{
QWidget::mousePressEvent( _me );
}
@@ -2669,8 +2673,11 @@ void TrackView::mousePressEvent( QMouseEvent * _me )
*/
void TrackView::mouseMoveEvent( QMouseEvent * _me )
{
if( m_trackContainerView->allowRubberband() == true )
int widgetTotal = ConfigManager::inst()->value( "ui",
"compacttrackbuttons" ).toInt()==1 ?
DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + TRACK_OP_WIDTH_COMPACT :
DEFAULT_SETTINGS_WIDGET_WIDTH + TRACK_OP_WIDTH;
if( m_trackContainerView->allowRubberband() == true && _me->x() > widgetTotal )
{
QWidget::mouseMoveEvent( _me );
}