From dd80301cee59805ca70bd23607c937aa744f9f33 Mon Sep 17 00:00:00 2001 From: Dave French Date: Wed, 28 Jan 2015 15:35:01 +0000 Subject: [PATCH] Proposed fix for #1532 Tracks in song editor cannot be moved in pattern select mode. --- src/core/Track.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/core/Track.cpp b/src/core/Track.cpp index 426676f0e..80f30f4c1 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -2612,7 +2612,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 ); } @@ -2666,8 +2670,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 ); }