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

Fix instrument window tab sizes

Browse Source 
- Fix the instrument window tabs minimum width and height formulae
- Also set minimum height and width for instrument tab
This commit is contained in:
Johannes Lorenz
2019-03-28 18:57:19 +01:00
parent 7e7141f388
commit d52c220a5c
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/InstrumentTrack.h
View File

@@ -427,6 +427,9 @@ protected slots:
private:
virtual void modelChanged();
void viewInstrumentInDirection(int d);
//! adjust size of any child widget of the main tab
//! required to keep the old look when using a variable sized tab widget
void adjustTabSize(QWidget *w);
InstrumentTrack * m_track;
InstrumentTrackView * m_itv;

26
src/tracks/InstrumentTrack.cpp
View File

@@ -1471,17 +1471,11 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
m_tabWidget->addTab( m_effectView, tr( "Effects" ), "fx_tab", 3 );
m_tabWidget->addTab( m_midiView, tr( "MIDI" ), "midi_tab", 4 );
m_tabWidget->addTab( m_miscView, tr( "Miscellaneous" ), "misc_tab", 5 );
//! adjust size of any child widget of the main tab
//! required to keep the old look when using a variable sized tab widget
auto adjustSize = [](QWidget *w) {
w->setMinimumSize(INSTRUMENT_WIDTH, INSTRUMENT_HEIGHT + GRAPHIC_TAB_HEIGHT);
};
adjustSize(m_ssView);
adjustSize(instrumentFunctions);
adjustSize(m_effectView);
adjustSize(m_midiView);
adjustSize(m_miscView);
adjustTabSize(m_ssView);
adjustTabSize(instrumentFunctions);
adjustTabSize(m_effectView);
adjustTabSize(m_midiView);
adjustTabSize(m_miscView);
// setup piano-widget
m_pianoView = new PianoView( this );
@@ -1497,7 +1491,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
resize( sizeHint() );
QMdiSubWindow * subWin = gui->mainWindow()->addWindowedWidget( this );
QMdiSubWindow* subWin = gui->mainWindow()->addWindowedWidget( this );
Qt::WindowFlags flags = subWin->windowFlags();
flags |= Qt::MSWindowsFixedSizeDialogHint;
flags &= ~Qt::WindowMaximizeButtonHint;
@@ -1659,6 +1653,8 @@ void InstrumentTrackWindow::updateInstrumentView()
modelChanged(); // Get the instrument window to refresh
m_track->dataChanged(); // Get the text on the trackButton to change
adjustTabSize(m_instrumentView);
}
}
@@ -1846,6 +1842,7 @@ void InstrumentTrackWindow::viewInstrumentInDirection(int d)
// scroll the SongEditor/BB-editor to make sure the new trackview label is visible
bringToFront->trackContainerView()->scrollToTrackView(bringToFront);
}
Q_ASSERT(bringToFront);
bringToFront->getInstrumentTrackWindow()->setFocus();
}
@@ -1858,4 +1855,9 @@ void InstrumentTrackWindow::viewPrevInstrument()
viewInstrumentInDirection(-1);
}
void InstrumentTrackWindow::adjustTabSize(QWidget *w)
{
w->setMinimumSize(INSTRUMENT_WIDTH - 4, INSTRUMENT_HEIGHT - 4);
}
#include "InstrumentTrack.moc"