mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-03 22:04:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the rendering of the tact numbers in the timeline

Browse Source 
Fixed the rendering of the tact numbers in the timeline widget. Before
this fix they were not readable because they were too big. Interestingly
in this case the fix is to use a font size in pixels (half the height of
the widget). The numbers are now also rendered a bit darker than the
lines.

Also removed the pixmap for the timeline from the code and from the
filesystem. It was only used to determine the fixed height of the widget
but not rendered. Therefore it was removed and the height is now
directly set to 18 pixels which was the height of the pixmap.
This commit is contained in:
Michael Gregorius
2015-07-30 22:32:38 +02:00
parent 76e4859ef0
commit fa5c0c1569
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/TimeLineWidget.cpp
View File

@@ -47,7 +47,6 @@
#endif
QPixmap * TimeLineWidget::s_timeLinePixmap = NULL;
QPixmap * TimeLineWidget::s_posMarkerPixmap = NULL;
QPixmap * TimeLineWidget::s_loopPointBeginPixmap = NULL;
QPixmap * TimeLineWidget::s_loopPointEndPixmap = NULL;
@@ -73,11 +72,6 @@ TimeLineWidget::TimeLineWidget( const int xoff, const int yoff, const float ppt,
m_loopPos[0] = 0;
m_loopPos[1] = DefaultTicksPerTact;
if( s_timeLinePixmap == NULL )
{
s_timeLinePixmap = new QPixmap( embed::getIconPixmap(
"timeline" ) );
}
if( s_posMarkerPixmap == NULL )
{
s_posMarkerPixmap = new QPixmap( embed::getIconPixmap(
@@ -96,7 +90,7 @@ TimeLineWidget::TimeLineWidget( const int xoff, const int yoff, const float ppt,
setAttribute( Qt::WA_OpaquePaintEvent, true );
move( 0, yoff );
setFixedHeight( s_timeLinePixmap->height() );
setFixedHeight( 18 );
m_xOffset -= s_posMarkerPixmap->width() / 2;
@@ -250,10 +244,18 @@ void TimeLineWidget::paintEvent( QPaintEvent * )
int x = m_xOffset + s_posMarkerPixmap->width() / 2 -
( ( static_cast<int>( m_begin * m_ppt ) / MidiTime::ticksPerTact() ) % static_cast<int>( m_ppt ) );
p.setPen( QColor( 192, 192, 192 ) );
QColor lineColor( 192, 192, 192 );
QColor tactColor( lineColor.darker( 120 ) );
// Set font to half of the widgets size (in pixels)
QFont font = p.font();
font.setPixelSize( this->height() * 0.5 );
p.setFont( font );
for( int i = 0; x + i * m_ppt < width(); ++i )
{
const int cx = x + qRound( i * m_ppt );
p.setPen( lineColor );
p.drawLine( cx, 5, cx, height() - 6 );
++tact_num;
if( ( tact_num - 1 ) %
@@ -261,9 +263,10 @@ void TimeLineWidget::paintEvent( QPaintEvent * )
MidiTime::ticksPerTact() / m_ppt ) ) == 0 )
{
const QString s = QString::number( tact_num );
p.setPen( tactColor );
p.drawText( cx + qRound( ( m_ppt - p.fontMetrics().
width( s ) ) / 2 ),
height() - p.fontMetrics().height() / 2, s );
height() - p.fontMetrics().ascent() / 2, s );
}
}