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

SongEditor: fixed horizontal scrollbar with Qt 4.5

Browse Source 
Due to optimizations in the graphics subsystem of Qt 4.5
songEditor::paintEvent() didn't get called regularly anymore and thus
the range of the horizontal scrollbar didn't get updated at all.

This commit makes the GUI track all changes related to the length of
the song.
(cherry picked from commit ff010da5ee)
This commit is contained in:
Tobias Doerffel
2009-04-05 23:54:28 +02:00
parent af8862fd2a
commit 99807eeb98
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/song.cpp
View File

@@ -575,6 +575,8 @@ void song::updateLength( void )
}
}
m_tracksMutex.unlock();
emit lengthChanged( m_length );
}

6
src/core/track.cpp
View File

@@ -913,7 +913,6 @@ void trackContentWidget::addTCOView( trackContentObjectView * _tcov )
tco->saveJournallingState( false );
changePosition();
tco->restoreJournallingState();
}
@@ -1776,11 +1775,9 @@ trackContentObject * track::addTCO( trackContentObject * _tco )
{
m_trackContentObjects.push_back( _tco );
// emit dataChanged();
emit trackContentObjectAdded( _tco );
//engine::getSongEditor()->setModified();
return( _tco ); // just for convenience
return _tco; // just for convenience
}
@@ -1798,6 +1795,7 @@ void track::removeTCO( trackContentObject * _tco )
if( it != m_trackContentObjects.end() )
{
m_trackContentObjects.erase( it );
engine::getSong()->updateLength();
engine::getSong()->setModified();
}
}

19
src/gui/song_editor.cpp
View File

@@ -374,6 +374,8 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
static_cast<QVBoxLayout *>( layout() )->addWidget( m_leftRightScroll );
connect( m_leftRightScroll, SIGNAL( valueChanged( int ) ),
this, SLOT( scrolled( int ) ) );
connect( m_s, SIGNAL( lengthChanged( int ) ),
this, SLOT( updateScrollBar( int ) ) );
engine::getMainWindow()->workspace()->addSubWindow( this );
@@ -509,15 +511,6 @@ void songEditor::keyPressEvent( QKeyEvent * _ke )
void songEditor::paintEvent( QPaintEvent * _pe )
{
m_leftRightScroll->setMaximum( m_s->length() );
trackContainerView::paintEvent( _pe );
}
void songEditor::wheelEvent( QWheelEvent * _we )
{
if( engine::getMainWindow()->isCtrlPressed() == TRUE )
@@ -646,6 +639,14 @@ void songEditor::masterPitchReleased( void )
void songEditor::updateScrollBar( int _len )
{
m_leftRightScroll->setMaximum( _len );
}
void songEditor::updatePosition( const midiTime & _t )
{
if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong