diff options
Diffstat (limited to 'muse2/muse/arranger/tlist.cpp')
| -rw-r--r-- | muse2/muse/arranger/tlist.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index f5edc8cf..8cc2a05a 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -1142,10 +1142,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); @@ -1307,7 +1308,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*))); |