diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-11-23 03:39:27 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-11-23 03:39:27 +0000 |
| commit | d0196814541920684787c1e0b8d99379eff8860f (patch) | |
| tree | 2bfb321528ef790add0e8639e7702bae007b2576 /muse2/muse/midiedit | |
| parent | 8f4b5462947d5b9a74e7fc439e28538172fd4967 (diff) | |
Fixed some remaining layout issues using setSpacing(0).
Diffstat (limited to 'muse2/muse/midiedit')
| -rw-r--r-- | muse2/muse/midiedit/drumedit.cpp | 12 | ||||
| -rw-r--r-- | muse2/muse/midiedit/pianoroll.cpp | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index f23ae012..8344635c 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -24,11 +24,13 @@ #include <QMessageBox> #include <QAction> #include <QWhatsThis> +#include <QList> +#include <QGridLayout> //Added by qt3to4: #include <QKeyEvent> -#include <Q3ValueList> -#include <Q3GridLayout> +//#include <Q3ValueList> +//#include <Q3GridLayout> #include <QResizeEvent> #include <QCloseEvent> @@ -302,6 +304,10 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini QWidget* split1w2 = new QWidget(split2, "split1w2"); QGridLayout* gridS1 = new QGridLayout(split1w1); QGridLayout* gridS2 = new QGridLayout(split1w2); + gridS1->setContentsMargins(0, 0, 0, 0); + gridS1->setSpacing(0); + gridS2->setContentsMargins(0, 0, 0, 0); + gridS2->setSpacing(0); time = new MTScale(&_raster, split1w2, xscale); canvas = new DrumCanvas(this, split1w2, xscale, yscale); vscroll = new ScrollScale(-4, 1, yscale, DRUM_MAPSIZE*TH, Qt::Vertical, split1w2); @@ -312,7 +318,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini connect(canvas, SIGNAL(toolChanged(int)), tools2, SLOT(set(int))); time->setOrigin(offset, 0); - Q3ValueList<int> mops; + QList<int> mops; mops.append(_dlistWidthInit); mops.append(_dcanvasWidthInit); split2->setSizes(mops); diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp index 7d93c582..54416b8f 100644 --- a/muse2/muse/midiedit/pianoroll.cpp +++ b/muse2/muse/midiedit/pianoroll.cpp @@ -254,6 +254,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i QWidget* split1 = new QWidget(splitter, "split1"); QGridLayout* gridS1 = new QGridLayout(split1); gridS1->setContentsMargins(0, 0, 0, 0); + gridS1->setSpacing(0); time = new MTScale(&_raster, split1, xscale); Piano* piano = new Piano(split1, yscale); canvas = new PianoCanvas(this, split1, xscale, yscale); |