merged with trunk

added "copy drummap" to duplicate track dialog

2 files changed, 7 insertions, 2 deletions

diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index 08999777..1f8aa27f 100644
--- a/muse2/muse/mixer/amixer.cpp
+++ b/muse2/muse/mixer/amixer.cpp
@@ -149,7 +149,8 @@ bool ScrollArea::viewportEvent(QEvent* event)
   if(event->type() == QEvent::LayoutRequest)       
     emit layoutRequest();
          
-  return false;       
+  //return false;       
+  return true;       
 }
 
 //---------------------------------------------------------
@@ -222,7 +223,7 @@ AudioMixerApp::AudioMixerApp(QWidget* parent, MusEGlobal::MixerConfig* c)
       
       ///view = new QScrollArea();
       view = new ScrollArea();
-      view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+//      view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
       setCentralWidget(view);
       
       central = new QWidget(view);
diff --git a/muse2/muse/mixer/strip.cpp b/muse2/muse/mixer/strip.cpp
index d574adb6..54cd2e8c 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -320,11 +320,15 @@ void Strip::mousePressEvent(QMouseEvent* ev)
     if (!act)
     {
       delete menu;
+      QFrame::mousePressEvent(ev);
       return;
     }
     MusEGlobal::song->removeTrack0(track);
     MusEGlobal::audio->msgUpdateSoloStates();
+    ev->accept();
+    return;
   }
+  QFrame::mousePressEvent(ev);
 }