diff options
| -rw-r--r-- | muse2/ChangeLog | 1 | ||||
| -rw-r--r-- | muse2/muse/ctrl/ctrledit.cpp | 3 | ||||
| -rw-r--r-- | muse2/muse/midiedit/drumedit.cpp | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 9d894106..a80f0db4 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -2,6 +2,7 @@ - More compiler and build warnings fixes. (Orcan) - Restored the scripts menu and fixed scripts handling. Tested OK. (Orcan) - Added left, right, up, down to shortcuts dialog. Test OK. (Tim) + - Fixed ctrl canvas not lining up in drumedit and pianoroll. (Orcan) 09.12.2010: - Fix: column orders mess up in the main window, and they do not save properly in the .med files. (Orcan) diff --git a/muse2/muse/ctrl/ctrledit.cpp b/muse2/muse/ctrl/ctrledit.cpp index f55fe8ef..fe04844d 100644 --- a/muse2/muse/ctrl/ctrledit.cpp +++ b/muse2/muse/ctrl/ctrledit.cpp @@ -42,6 +42,9 @@ CtrlEdit::CtrlEdit(QWidget* parent, MidiEditor* e, int xmag, canvas = new CtrlCanvas(e, 0, xmag, "ctrlcanvas", panel); QWidget* vscale = new VScale; + hbox->setContentsMargins(0, 0, 0, 0); + hbox->setSpacing (0); + canvas->setOrigin(-(config.division/4), 0); canvas->setMinimumHeight(50); diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index b2a2702c..bd1a55eb 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -928,7 +928,11 @@ CtrlEdit* DrumEdit::addCtrl() split2->setCollapsible(split2->indexOf(split1w1), false); split1w1->setMinimumWidth(CTRL_PANEL_FIXED_WIDTH); } - ctrlEdit->setCanvasWidth(canvas->width()); + + int dw = vscroll->width() - 18;// 18 is the fixed width of the CtlEdit VScale widget. + if(dw < 1) + dw = 1; + ctrlEdit->setCanvasWidth(canvas->width() + dw); ctrlEdit->show(); ctrlEditList.push_back(ctrlEdit); |