hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix for Icons and comboboxes mismatch in arpeggiator in Instrument Editor #5494 (#5623)

Browse Source 
* Fix for Icons and comboboxes mismatch in arpeggiator in Instrument Editor #5494
(https://github.com/LMMS/lmms/issues/5494)

Introduce a static const int variable for the default height of a ComboBox.
Set this height already in the constructor of the ComboBox object.
Update all modules setting the height of a ComboBox object to make use of the new constant.

* Replace 'const int' by 'constexpr int' after review.
This commit is contained in:
DigArtRoks
2020-08-17 16:12:49 +02:00
committed by GitHub
parent 1c1575cc86
commit 9ed41c4927
15 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/audio/AudioPortAudio.cpp
View File

@@ -410,14 +410,14 @@ AudioPortAudio::setupWidget::setupWidget( QWidget * _parent ) :
AudioDeviceSetupWidget( AudioPortAudio::name(), _parent )
{
m_backend = new ComboBox( this, "BACKEND" );
m_backend->setGeometry( 64, 15, 260, 20 );
m_backend->setGeometry( 64, 15, 260, ComboBox::DEFAULT_HEIGHT );
QLabel * backend_lbl = new QLabel( tr( "Backend" ), this );
backend_lbl->setFont( pointSize<7>( backend_lbl->font() ) );
backend_lbl->move( 8, 18 );
m_device = new ComboBox( this, "DEVICE" );
m_device->setGeometry( 64, 35, 260, 20 );
m_device->setGeometry( 64, 35, 260, ComboBox::DEFAULT_HEIGHT );
QLabel * dev_lbl = new QLabel( tr( "Device" ), this );
dev_lbl->setFont( pointSize<7>( dev_lbl->font() ) );

2
src/gui/ControllerConnectionDialog.cpp
View File

@@ -187,7 +187,7 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent,
this, SLOT( userToggled() ) );
m_userController = new ComboBox( m_userGroupBox, "Controller" );
m_userController->setGeometry( 10, 24, 200, 22 );
m_userController->setGeometry( 10, 24, 200, ComboBox::DEFAULT_HEIGHT );
for (Controller * c : Engine::getSong()->controllers())
{
m_userController->model()->addItem( c->name() );

6
src/gui/editors/AutomationEditor.cpp
View File

@@ -2349,7 +2349,7 @@ AutomationEditorWindow::AutomationEditorWindow() :
zoom_x_label->setPixmap( embed::getIconPixmap( "zoom_x" ) );
m_zoomingXComboBox = new ComboBox( zoomToolBar );
m_zoomingXComboBox->setFixedSize( 80, 22 );
m_zoomingXComboBox->setFixedSize( 80, ComboBox::DEFAULT_HEIGHT );
m_zoomingXComboBox->setToolTip( tr( "Horizontal zooming" ) );
for( float const & zoomLevel : m_editor->m_zoomXLevels )
@@ -2368,7 +2368,7 @@ AutomationEditorWindow::AutomationEditorWindow() :
zoom_y_label->setPixmap( embed::getIconPixmap( "zoom_y" ) );
m_zoomingYComboBox = new ComboBox( zoomToolBar );
m_zoomingYComboBox->setFixedSize( 80, 22 );
m_zoomingYComboBox->setFixedSize( 80, ComboBox::DEFAULT_HEIGHT );
m_zoomingYComboBox->setToolTip( tr( "Vertical zooming" ) );
m_editor->m_zoomingYModel.addItem( "Auto" );
@@ -2398,7 +2398,7 @@ AutomationEditorWindow::AutomationEditorWindow() :
quantize_lbl->setPixmap( embed::getIconPixmap( "quantize" ) );
m_quantizeComboBox = new ComboBox( m_toolBar );
m_quantizeComboBox->setFixedSize( 60, 22 );
m_quantizeComboBox->setFixedSize( 60, ComboBox::DEFAULT_HEIGHT );
m_quantizeComboBox->setToolTip( tr( "Quantization" ) );
m_quantizeComboBox->setModel( &m_editor->m_quantizeModel );

2
src/gui/editors/BBEditor.cpp
View File

@@ -75,7 +75,7 @@ BBEditor::BBEditor( BBTrackContainer* tc ) :
DropToolBar *beatSelectionToolBar = addDropToolBarToTop(tr("Beat selector"));
m_bbComboBox = new ComboBox( m_toolBar );
m_bbComboBox->setFixedSize( 200, 22 );
m_bbComboBox->setFixedSize( 200, ComboBox::DEFAULT_HEIGHT );
m_bbComboBox->setModel( &tc->m_bbComboBoxModel );
beatSelectionToolBar->addWidget( m_bbComboBox );

12
src/gui/editors/PianoRoll.cpp
View File

@@ -4344,7 +4344,7 @@ PianoRollWindow::PianoRollWindow() :
m_zoomingComboBox = new ComboBox( m_toolBar );
m_zoomingComboBox->setModel( &m_editor->m_zoomingModel );
m_zoomingComboBox->setFixedSize( 64, 22 );
m_zoomingComboBox->setFixedSize( 64, ComboBox::DEFAULT_HEIGHT );
m_zoomingComboBox->setToolTip( tr( "Horizontal zooming") );
QLabel * zoom_y_lbl = new QLabel(m_toolBar);
@@ -4352,7 +4352,7 @@ PianoRollWindow::PianoRollWindow() :
m_zoomingYComboBox = new ComboBox(m_toolBar);
m_zoomingYComboBox->setModel(&m_editor->m_zoomingYModel);
m_zoomingYComboBox->setFixedSize(64, 22);
m_zoomingYComboBox->setFixedSize(64, ComboBox::DEFAULT_HEIGHT);
m_zoomingYComboBox->setToolTip(tr("Vertical zooming"));
// setup quantize-stuff
@@ -4361,7 +4361,7 @@ PianoRollWindow::PianoRollWindow() :
m_quantizeComboBox = new ComboBox( m_toolBar );
m_quantizeComboBox->setModel( &m_editor->m_quantizeModel );
m_quantizeComboBox->setFixedSize( 64, 22 );
m_quantizeComboBox->setFixedSize( 64, ComboBox::DEFAULT_HEIGHT );
m_quantizeComboBox->setToolTip( tr( "Quantization") );
// setup note-len-stuff
@@ -4370,7 +4370,7 @@ PianoRollWindow::PianoRollWindow() :
m_noteLenComboBox = new ComboBox( m_toolBar );
m_noteLenComboBox->setModel( &m_editor->m_noteLenModel );
m_noteLenComboBox->setFixedSize( 105, 22 );
m_noteLenComboBox->setFixedSize( 105, ComboBox::DEFAULT_HEIGHT );
m_noteLenComboBox->setToolTip( tr( "Note length") );
// setup scale-stuff
@@ -4379,7 +4379,7 @@ PianoRollWindow::PianoRollWindow() :
m_scaleComboBox = new ComboBox( m_toolBar );
m_scaleComboBox->setModel( &m_editor->m_scaleModel );
m_scaleComboBox->setFixedSize( 105, 22 );
m_scaleComboBox->setFixedSize( 105, ComboBox::DEFAULT_HEIGHT );
m_scaleComboBox->setToolTip( tr( "Scale") );
// setup chord-stuff
@@ -4388,7 +4388,7 @@ PianoRollWindow::PianoRollWindow() :
m_chordComboBox = new ComboBox( m_toolBar );
m_chordComboBox->setModel( &m_editor->m_chordModel );
m_chordComboBox->setFixedSize( 105, 22 );
m_chordComboBox->setFixedSize( 105, ComboBox::DEFAULT_HEIGHT );
m_chordComboBox->setToolTip( tr( "Chord" ) );
// -- Clear ghost pattern button

4
src/gui/editors/SongEditor.cpp
View File

@@ -955,7 +955,7 @@ SongEditorWindow::SongEditorWindow(Song* song) :
//Set up zooming-stuff
m_zoomingComboBox = new ComboBox( m_toolBar );
m_zoomingComboBox->setFixedSize( 80, 22 );
m_zoomingComboBox->setFixedSize( 80, ComboBox::DEFAULT_HEIGHT );
m_zoomingComboBox->move( 580, 4 );
m_zoomingComboBox->setModel(m_editor->m_zoomingModel);
m_zoomingComboBox->setToolTip(tr("Horizontal zooming"));
@@ -970,7 +970,7 @@ SongEditorWindow::SongEditorWindow(Song* song) :
//Set up quantization/snapping selector
m_snappingComboBox = new ComboBox( m_toolBar );
m_snappingComboBox->setFixedSize( 80, 22 );
m_snappingComboBox->setFixedSize( 80, ComboBox::DEFAULT_HEIGHT );
m_snappingComboBox->setModel(m_editor->m_snappingModel);
m_snappingComboBox->setToolTip(tr("Clip snapping size"));
connect(m_editor->snappingModel(), SIGNAL(dataChanged()), this, SLOT(updateSnapLabel()));

2
src/gui/widgets/ComboBox.cpp
View File

@@ -51,6 +51,8 @@ ComboBox::ComboBox( QWidget * _parent, const QString & _name ) :
m_menu( this ),
m_pressed( false )
{
setFixedHeight( ComboBox::DEFAULT_HEIGHT );
if( s_background == NULL )
{
s_background = new QPixmap( embed::getIconPixmap( "combobox_bg" ) );

2
src/gui/widgets/Controls.cpp
View File

@@ -78,7 +78,7 @@ ComboControl::ComboControl(QWidget *parent) :
m_combo(new ComboBox(nullptr)),
m_label(new QLabel(m_widget))
{
m_combo->setFixedSize(64, 22);
m_combo->setFixedSize(64, ComboBox::DEFAULT_HEIGHT);
QVBoxLayout* vbox = new QVBoxLayout(m_widget);
vbox->addWidget(m_combo);
vbox->addWidget(m_label);

2
src/gui/widgets/InstrumentSoundShapingView.cpp
View File

@@ -74,7 +74,7 @@ InstrumentSoundShapingView::InstrumentSoundShapingView( QWidget * _parent ) :
m_filterComboBox = new ComboBox( m_filterGroupBox );
m_filterComboBox->setGeometry( 14, 22, 120, 22 );
m_filterComboBox->setGeometry( 14, 22, 120, ComboBox::DEFAULT_HEIGHT );
m_filterComboBox->setFont( pointSize<8>( m_filterComboBox->font() ) );