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

1st PoC for autosizeable artwork tabs.

Browse Source
This commit is contained in:
Cyrille Bollu
2016-02-21 17:43:00 +01:00
parent d9964006b7
commit f071393e55
3 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/themes/default/midi_inactive.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 961 B

56
src/gui/widgets/TabWidget.cpp
View File

@@ -74,13 +74,8 @@ void TabWidget::addTab( QWidget * _w, const QString & _name, const char * pixma
}
}
// Compute tab's width
int w;
if ( pixmapName == NULL ) {
w = fontMetrics().width( _name ) + 10;
} else {
w = 28; // artwork's width
}
// Tab's width when it is a text tab
int w = fontMetrics().width( _name ) + 10;
// Register new tab
widgetDesc d = { _w, pixmapName, _name, w } ;
@@ -209,48 +204,57 @@ void TabWidget::paintEvent( QPaintEvent * _pe )
p.setPen( cap_col );
// Draw all tabs
for( widgetStack::iterator it = m_widgets.begin();
it != m_widgets.end(); ++it )
widgetStack::iterator first = m_widgets.begin();
widgetStack::iterator last = m_widgets.end();
int size = std::distance(first,last);
for( widgetStack::iterator it = first ; it != last ; ++it )
{
// Draw a text tab when no artwork has been defined for the tab.
if ( (*it ).pixmapName == NULL )
{
// Highlight text tabs when they are active
if ( it.key() == m_activeTab ) {
{
// Highlight tab when active
if( it.key() == m_activeTab )
{
p.setPen( QColor( 32, 48, 64 ) );
p.fillRect( tab_x_offset, 2, ( *it ).nwidth - 6, 10, cap_col );
}
// Draw tab
// Draw text
p.drawText( tab_x_offset + 3, m_tabheight, ( *it ).name );
// Reset text color
p.setPen( cap_col );
} else
{
// Get active or inactive artwork
std::string tab = std::string( ( *it ).pixmapName );
if( it.key() == m_activeTab )
{
tab += "_active";
} else
{
tab += "_inactive";
}
QPixmap *artwork = new QPixmap( embed::getIconPixmap( tab.c_str() ) );
// Get artwork
QPixmap *artwork = new QPixmap( embed::getIconPixmap( ( *it ).pixmapName ) );
if( it.key() == m_activeTab )
{
p.fillRect( tab_x_offset, 1, width() / size, 12, cap_col );
}
// Draw artwork
p.drawPixmap(tab_x_offset + ( width() / ( size * 2 ) ) - 7, 0, *artwork );
// Recompute tab's width, because original size is only correct for text tabs
( *it).nwidth = width() / size;
// Draw tab
p.drawPixmap(tab_x_offset, 0, *artwork );
}
// Next tab's horizontal position
tab_x_offset += ( *it ).nwidth;
}
}
// Switch between tabs with mouse wheel
void TabWidget::wheelEvent( QWheelEvent * _we )
{
if (_we->y() > m_tabheight)

2
src/tracks/InstrumentTrack.cpp
View File

@@ -1437,7 +1437,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) :
m_tabWidget->addTab( m_ssView, tr( "ENV/LFO" ), "env_lfo", 1 );
m_tabWidget->addTab( instrumentFunctions, tr( "FUNC" ), "functions", 2 );
m_tabWidget->addTab( m_effectView, tr( "FX" ), "fx", 3 );
m_tabWidget->addTab( m_midiView, tr( "MIDI" ), "midi", 4 );
m_tabWidget->addTab( m_midiView, tr( "MIDI" ), "midi_inactive", 4 );
m_tabWidget->addTab( m_miscView, tr( "MISC" ), "miscellaneous", 5 );
// setup piano-widget