# HG changeset patch # User Chris Cannam # Date 1234363454 0 # Node ID 4afdcecbd62ec4b9e79f60aad3328455dcc64f09 # Parent f60b6204856e7dbbca5d8a8b2da862d2ca7a97f4 * experiment (does this improve layout on mac?) diff -r f60b6204856e -r 4afdcecbd62e widgets/PropertyBox.cpp --- a/widgets/PropertyBox.cpp Mon Feb 09 16:50:52 2009 +0000 +++ b/widgets/PropertyBox.cpp Wed Feb 11 14:44:14 2009 +0000 @@ -293,7 +293,7 @@ m_layout->addWidget(new QLabel(groupName, m_mainWidget), row, 0); QFrame *frame = new QFrame(m_mainWidget); m_layout->addWidget(frame, row, 1, 1, 2); - m_groupLayouts[groupName] = new QHBoxLayout; + m_groupLayouts[groupName] = new QGridLayout; m_groupLayouts[groupName]->setMargin(0); frame->setLayout(m_groupLayouts[groupName]); } @@ -337,7 +337,8 @@ this, SLOT(mouseLeftWidget())); if (inGroup) { button->setToolTip(propertyLabel); - m_groupLayouts[groupName]->addWidget(button); + m_groupLayouts[groupName]->addWidget + (button, 0, m_groupLayouts[groupName]->columnCount()); } else { m_layout->addWidget(button, row, 1, 1, 2); } @@ -390,7 +391,8 @@ if (inGroup) { dial->setFixedWidth(24); dial->setFixedHeight(24); - m_groupLayouts[groupName]->addWidget(dial); + m_groupLayouts[groupName]->addWidget + (dial, 0, m_groupLayouts[groupName]->columnCount()); } else { dial->setFixedWidth(32); dial->setFixedHeight(32); @@ -482,7 +484,8 @@ if (inGroup) { cb->setToolTip(propertyLabel); - m_groupLayouts[groupName]->addWidget(cb); + m_groupLayouts[groupName]->addWidget + (cb, 0, m_groupLayouts[groupName]->columnCount()); } else { m_layout->addWidget(cb, row, 1, 1, 2); } diff -r f60b6204856e -r 4afdcecbd62e widgets/PropertyBox.h --- a/widgets/PropertyBox.h Mon Feb 09 16:50:52 2009 +0000 +++ b/widgets/PropertyBox.h Wed Feb 11 14:44:14 2009 +0000 @@ -85,7 +85,7 @@ QVBoxLayout *m_mainBox; LEDButton *m_showButton; LEDButton *m_playButton; - std::map m_groupLayouts; + std::map m_groupLayouts; std::map m_propertyControllers; };