Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for grid layout in wxRadioBox under wxQT

Browse Source
This commit is contained in:
Graham Dawes
2019-01-11 14:39:54 +00:00
parent 12d4ed3e8c
commit 4f32cfc5fb
2 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/qt/radiobox.h
View File

@@ -10,7 +10,7 @@
class QGroupBox;
class QButtonGroup;
class QBoxLayout;
class QGridLayout;
class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase
{
@@ -89,7 +89,7 @@ private:
QButtonGroup *m_qtButtonGroup;
// Autofit layout for buttons (either vert. or horiz.):
QBoxLayout *m_qtBoxLayout;
QGridLayout *m_qtGridLayout;
wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
};

57
src/qt/radiobox.cpp
View File

@@ -59,7 +59,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
wxRadioBox::wxRadioBox() :
m_qtGroupBox(NULL),
m_qtButtonGroup(NULL),
m_qtBoxLayout(NULL)
m_qtGridLayout(NULL)
{
}
@@ -110,19 +110,46 @@ bool wxRadioBox::Create(wxWindow *parent,
}
static void AddChoices( QButtonGroup *qtButtonGroup, QBoxLayout *qtBoxLayout, int count, const wxString choices[] )
static void AddChoices( QButtonGroup *qtButtonGroup, QGridLayout *qtGridLayout, int count, const wxString choices[], int style, int majorDim )
{
if ( count <= 0 )
return;
// wxRA_SPECIFY_COLS means that we arrange buttons in
// left to right order and GetMajorDim() is the number of columns while
// wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
// GetMajorDim() is the number of rows.
const bool columnMajor = style & wxRA_SPECIFY_COLS;
const int numMajor = majorDim > 0 ? majorDim : count;
bool isFirst = true;
for (int i = 0; i < count; ++i )
for ( int i = 0; i < count; ++i )
{
QRadioButton *btn = new QRadioButton( wxQtConvertString( choices[i] ));
QRadioButton *btn = new QRadioButton(wxQtConvertString (choices[i]) );
qtButtonGroup->addButton( btn, i );
qtBoxLayout->addWidget( btn );
if ( isFirst )
int row;
int col;
if (columnMajor)
{
btn->setChecked(true);
col = i % numMajor;
row = i / numMajor;
}
else
{
col = i / numMajor;
row = i % numMajor;
}
qtGridLayout->addWidget( btn, row, col );
if (isFirst)
{
btn->setChecked( true );
isFirst = false;
}
}
@@ -135,7 +162,7 @@ bool wxRadioBox::Create(wxWindow *parent,
const wxPoint& pos,
const wxSize& size,
int n, const wxString choices[],
int WXUNUSED(majorDim),
int majorDim,
long style,
const wxValidator& val,
const wxString& name)
@@ -147,18 +174,10 @@ bool wxRadioBox::Create(wxWindow *parent,
if ( !(style & (wxRA_SPECIFY_ROWS | wxRA_SPECIFY_COLS)) )
style |= wxRA_SPECIFY_COLS;
// wxRA_SPECIFY_COLS means that we arrange buttons in
// left to right order and GetMajorDim() is the number of columns while
// wxRA_SPECIFY_ROWS means that the buttons are arranged top to bottom and
// GetMajorDim() is the number of rows.
if ( style & wxRA_SPECIFY_COLS )
m_qtBoxLayout = new QHBoxLayout;
else if ( style & wxRA_SPECIFY_ROWS )
m_qtBoxLayout = new QVBoxLayout;
m_qtGridLayout = new QGridLayout;
AddChoices( m_qtButtonGroup, m_qtBoxLayout, n, choices );
m_qtBoxLayout->addStretch(1);
m_qtGroupBox->setLayout(m_qtBoxLayout);
AddChoices( m_qtButtonGroup, m_qtGridLayout, n, choices, style, majorDim );
m_qtGroupBox->setLayout(m_qtGridLayout);
return QtCreateControl( parent, id, pos, size, style, val, name );
}