diff options
author | Florian Jung <flo@windfisch.org> | 2012-01-03 17:26:09 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2012-01-03 17:26:09 +0000 |
commit | 1bc4ba9dfc00b6e7511fbf4765296a2002f83315 (patch) | |
tree | df6a0d5d9b61d64005dd368afea0aea11ab0a6b3 /muse2/muse/mixer | |
parent | b988a0a27bc175ce10bc8fa53ed131486813f3e7 (diff) |
merged with release_2_0
Diffstat (limited to 'muse2/muse/mixer')
-rw-r--r-- | muse2/muse/mixer/amixer.cpp | 5 | ||||
-rw-r--r-- | muse2/muse/mixer/strip.cpp | 4 |
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); } |