merged with release_2_0

2 files changed, 7 insertions, 2 deletions

diff --git a/muse2/muse/mixer/amixer.cpp b/muse2/muse/mixer/amixer.cpp
index d03cc81e..d9513a47 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;       
 }
 
 //---------------------------------------------------------
@@ -219,7 +220,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 e8b52887..c6e79f17 100644
--- a/muse2/muse/mixer/strip.cpp
+++ b/muse2/muse/mixer/strip.cpp
@@ -316,11 +316,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);
 }