Skip to content

Commit

Permalink
Add scroll bars to MSL version selection dialog (#7279)
Browse files Browse the repository at this point in the history
  • Loading branch information
adeas31 committed Mar 9, 2021
1 parent 46ea13b commit e3b7e2d
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
21 changes: 20 additions & 1 deletion OMEdit/OMEditLIB/MainWindow.cpp
Expand Up @@ -4629,7 +4629,14 @@ MSLVersionDialog::MSLVersionDialog(QWidget *parent)
pMainGridLayout->addLayout(pRadioButtonsLayout, 3, 0);
pMainGridLayout->addWidget(pPostInfoLabel, 4, 0);
pMainGridLayout->addWidget(pOkButton, 5, 0, Qt::AlignRight);
setLayout(pMainGridLayout);
mpWidget = new QWidget;
mpWidget->setLayout(pMainGridLayout);
QScrollArea *pScrollArea = new QScrollArea;
pScrollArea->setWidgetResizable(true);
pScrollArea->setWidget(mpWidget);
QVBoxLayout *pMainLayout = new QVBoxLayout;
pMainLayout->addWidget(pScrollArea);
setLayout(pMainLayout);
}

/*!
Expand Down Expand Up @@ -4672,3 +4679,15 @@ void MSLVersionDialog::reject()
{
// do nothing here.
}

/*!
* \brief MSLVersionDialog::sizeHint
* \return
*/
QSize MSLVersionDialog::sizeHint() const
{
QSize size = QWidget::sizeHint();
size.rwidth() = mpWidget->width();
size.rheight() = mpWidget->height() + 50; // add 50 for dialog frame and title bar
return size;
}
5 changes: 5 additions & 0 deletions OMEdit/OMEditLIB/MainWindow.h
Expand Up @@ -597,12 +597,17 @@ class MSLVersionDialog : public QDialog
QRadioButton *mpMSL3RadioButton;
QRadioButton *mpMSL4RadioButton;
QRadioButton *mpNoMSLRadioButton;
QWidget *mpWidget;
private slots:
void setMSLVersion();

// QDialog interface
public slots:
virtual void reject() override;

// QWidget interface
public:
virtual QSize sizeHint() const override;
};

#endif // MAINWINDOW_H

0 comments on commit e3b7e2d

Please sign in to comment.