X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=blobdiff_plain;f=qui%2Fmussa_setup_dialog%2FSequenceSetupFrame.cpp;fp=qui%2Fmussa_setup_dialog%2FSequenceSetupFrame.cpp;h=0e12da4782216ccac868141390b8f0f39c234fa1;hp=4e1fb07f43dd0e5dc2d5de61368d0caff31a0978;hb=0c1c957ddc2e51b005065f7aaf56460274a782c8;hpb=677399612a513c6e2fe86c23fe0ad2b40378e3a8 diff --git a/qui/mussa_setup_dialog/SequenceSetupFrame.cpp b/qui/mussa_setup_dialog/SequenceSetupFrame.cpp index 4e1fb07..0e12da4 100644 --- a/qui/mussa_setup_dialog/SequenceSetupFrame.cpp +++ b/qui/mussa_setup_dialog/SequenceSetupFrame.cpp @@ -24,7 +24,6 @@ SequenceSetupFrame::SequenceSetupFrame(QWidget *parent) sequenceLayout = new QVBoxLayout; sequenceFrame->setLayout(sequenceLayout); - sequenceFrame->resize(500,500); //scroll area scrollArea = new QScrollArea; @@ -35,9 +34,14 @@ SequenceSetupFrame::SequenceSetupFrame(QWidget *parent) setLayout(mainLayout); //Initialize to one sequence - changeSequenceCount(1); + changeSequenceCount(2); + //scrollArea->resize(sequenceFrame->sizeHint()); + //sequenceFrame->resize(500,500); + //sequenceFrame->resize(scrollArea->size()); + scrollArea->setWidgetResizable(TRUE); scrollArea->show(); + } QDir SequenceSetupFrame::get_default_dir() const @@ -54,19 +58,14 @@ void SequenceSetupFrame::changeSequenceCount(int newSeqCount) { seqCount = newSeqCount; setupSequences(seqCount); - resizeInnerFrame(seqCount); + resizeInnerFrame(); } -void SequenceSetupFrame::resizeInnerFrame(int seqCount) +void SequenceSetupFrame::resizeInnerFrame() { - if (seqCount >= 1) - { - sequenceFrame->resize(565, 125 * seqCount + 30); - } - else - { - sequenceFrame->resize(565, 125 + 30); - } + QSize box(seqList.front()->sizeHint()); + + sequenceFrame->resize(box.width(), box.height() * seqList.size() + 30); } void SequenceSetupFrame::setupSequences(int newSeqCount)