diff options
Diffstat (limited to 'muse2/muse/arranger/tlist.cpp')
-rw-r--r-- | muse2/muse/arranger/tlist.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index db83ad71..77c00d2d 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -66,9 +66,10 @@ #include "dssihost.h" #endif -namespace MusEApp { +//namespace MusEApp { FINDMICHJETZT: again: dirty, dirty. implemented in arrangerview.cpp +// should be moved together with populateAddTrack somewhere else extern QMenu* populateAddSynth(QWidget* parent); -} +//} static const int MIN_TRACKHEIGHT = 20; static const int WHEEL_DELTA = 120; @@ -1017,7 +1018,7 @@ void TList::mousePressEvent(QMouseEvent* ev) aaux->setData(Track::AUDIO_AUX); // Create a sub-menu and fill it with found synth types. Make p the owner. - QMenu* synp = MusEApp::populateAddSynth(p); + QMenu* synp = populateAddSynth(p); synp->setIcon(*synthIcon); synp->setTitle(QT_TRANSLATE_NOOP("@default", "Add Synth")); @@ -1401,24 +1402,24 @@ void TList::mousePressEvent(QMouseEvent* ev) // selectTrack //--------------------------------------------------------- void TList::selectTrack(Track* tr) - { - song->deselectTracks(); - tr->setSelected(true); - +{ + song->deselectTracks(); - // rec enable track if expected - TrackList recd = getRecEnabledTracks(); - if (recd.size() == 1 && MusEConfig::config.moveArmedCheckBox) { // one rec enabled track, move rec enabled with selection - song->setRecordFlag((Track*)recd.front(),false); - song->setRecordFlag(tr,true); - } + if (tr) { + tr->setSelected(true); - // By T356. Force a redraw for wave tracks, since it does not seem to happen. - //if(!tr->isMidiTrack()) - redraw(); - ///emit selectionChanged(); - emit selectionChanged(tr); - } + + // rec enable track if expected + TrackList recd = getRecEnabledTracks(); + if (recd.size() == 1 && MusEConfig::config.moveArmedCheckBox) { // one rec enabled track, move rec enabled with selection + song->setRecordFlag((Track*)recd.front(),false); + song->setRecordFlag(tr,true); + } + } + + redraw(); + emit selectionChanged(tr); +} //--------------------------------------------------------- // selectTrackAbove |