merged again

5 files changed, 16 insertions, 12 deletions

diff --git a/muse2/muse/arranger/alayout.cpp b/muse2/muse/arranger/alayout.cpp
index 119da498..84923f12 100644
--- a/muse2/muse/arranger/alayout.cpp
+++ b/muse2/muse/arranger/alayout.cpp
@@ -138,7 +138,8 @@ void TLLayout::setGeometry(const QRect &rect)
             range = 0;
       // Note this appears to cause a single recursive call to this function - jumps to beginning,
       //  because now the scroll bar wants to be put in the layout.
-      sb->setVisible(range != 0);
+      // Moved below.   p4.0.44      
+      ///sb->setVisible(range != 0);
       if (range)
             sb->setMaximum(range);
 
@@ -154,6 +155,9 @@ void TLLayout::setGeometry(const QRect &rect)
       li[4]->setGeometry(QRect(0,  y2,  w,        s4.height()));
       li[5]->setGeometry(QRect(3,  y3,  s5.width(), s5.height()));
       
+      /// Fix for non-appearing scrollbar. Yes, we must allow the recursive call, but try it here, not above.    p4.0.44 Tim
+      sb->setVisible(range != 0);
+      
       //_inSetGeometry = false;
       }
 
diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index cb024070..af5c9785 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -1032,12 +1032,13 @@ void Arranger::genTrackInfo(QWidget* parent)
       noTrackInfo->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding));
 
       midiTrackInfo = new MidiTrackInfo(trackInfo);
+      
       //midiTrackInfo->setFocusPolicy(Qt::TabFocus);    // p4.0.9
       //midiTrackInfo->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum));
       trackInfo->addWidget(noTrackInfo,   0);
       trackInfo->addWidget(midiTrackInfo, 1);
       trackInfo->addWidget(0, 2);
-
+      
 ///      genMidiTrackInfo();
       }
 
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index f190de3b..05b7b12a 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -1763,7 +1763,7 @@ void PartCanvas::drawItem(QPainter& p, const CItem* item, const QRect& rect)
             //bool rev = (brightness < 12000 || part->selected()) && !part->mute() && !item->isMoving();
             bool rev = brightness >= 12000 && !part->selected();
             p.save();
-            p.setFont(MusEGlobal::config.fonts[1]);
+            p.setFont(MusEGlobal::config.fonts[4]);
             p.setWorldMatrixEnabled(false);
             if (rev)
               p.setPen(Qt::white); 
@@ -2256,7 +2256,7 @@ void PartCanvas::drawItem(QPainter& p, const CItem* item, const QRect& rect)
             brightness =  part_r*29 + part_g*59 + part_b*12;
             //bool rev = (brightness < 12000 || part->selected()) && !part->mute() && !item->isMoving();
             bool rev = brightness >= 12000 && !part->selected();
-            p.setFont(MusEGlobal::config.fonts[1]);
+            p.setFont(MusEGlobal::config.fonts[4]);
             if (rev)
               p.setPen(Qt::white); 
             else
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index 620a24b7..4fc39c2c 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -585,10 +585,6 @@ void TList::portsPopupMenu(MusECore::Track* t, int x, int y)
       switch(t->type()) {
             case MusECore::Track::MIDI:
             case MusECore::Track::DRUM:
-            // FINDMICHJETZT: this is a notice for flo's experimental
-            //                branch! don't forget NEW_DRUM here!
-            //                please don't remove this. i'll do it when
-            //                the time is there.
             case MusECore::Track::AUDIO_SOFTSYNTH: 
             {
                   MusECore::MidiTrack* track = (MusECore::MidiTrack*)t;
@@ -1136,10 +1132,11 @@ void TList::changeAutomationColor(QAction* act)
 //   colorMenu
 //---------------------------------------------------------
 //QMenu* TList::colorMenu(QColor c, int id)
-PopupMenu* TList::colorMenu(QColor c, int id)
+PopupMenu* TList::colorMenu(QColor c, int id, QWidget* parent)
 {
   //QMenu * m = new QMenu(this);
-  PopupMenu * m = new PopupMenu(this);  //, true);  TODO
+  //PopupMenu * m = new PopupMenu(this);  //, true);  TODO
+  PopupMenu * m = new PopupMenu(parent);  //, true);  //
   for (int i = 0; i< 6; i++) {
     QPixmap pix(10,10);
     QPainter p(&pix);
@@ -1301,7 +1298,8 @@ void TList::mousePressEvent(QMouseEvent* ev)
                       data += 150; // illegal color > 100
                       act->setData(data);
                       //QMenu *m = colorMenu(cl->color(), cl->id());
-                      PopupMenu *m = colorMenu(cl->color(), cl->id());
+                      //PopupMenu *m = colorMenu(cl->color(), cl->id());
+                      PopupMenu *m = colorMenu(cl->color(), cl->id(), p);
                       act->setMenu(m);
                     }
                     connect(p, SIGNAL(triggered(QAction*)), SLOT(changeAutomation(QAction*)));
diff --git a/muse2/muse/arranger/tlist.h b/muse2/muse/arranger/tlist.h
index 2aeae939..5ae3fbe9 100644
--- a/muse2/muse/arranger/tlist.h
+++ b/muse2/muse/arranger/tlist.h
@@ -27,6 +27,7 @@
 
 #include <QWidget>
 
+class QWidget;
 class QKeyEvent;
 class QLineEdit;
 class QSpinBox;
@@ -109,7 +110,7 @@ class TList : public QWidget {
       MusECore::TrackList getRecEnabledTracks();
       void setHeaderToolTips();
       //QMenu* colorMenu(QColor c, int id);
-      PopupMenu* colorMenu(QColor c, int id);
+      PopupMenu* colorMenu(QColor c, int id, QWidget* parent);
 
    private slots:
       void returnPressed();