mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-10 10:10:02 -04:00
Code Issues Packages Projects Releases 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.
This commit is contained in:
Tobias Doerffel
2009-04-05 23:54:28 +02:00
parent 0ae72462d9
commit ff010da5ee
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/song.h
View File

@@ -312,6 +312,7 @@ private:
friend class controllerRackView;
signals:
void lengthChanged( int _tacts );
void tempoChanged( bpm_t _new_bpm );
void timeSignatureChanged( int _old_ticks_per_tact,
int _ticks_per_tact );

8
include/song_editor.h
View File

@@ -2,7 +2,7 @@
* song_editor.h - declaration of class songEditor, a window where you can
* setup your songs
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -66,15 +66,13 @@ public slots:
private slots:
void updatePosition( const midiTime & _t );
void updateScrollBar( int );
void updatePosition( const midiTime & _t );
void zoomingChanged( void );
private:
virtual void keyPressEvent( QKeyEvent * _ke );
virtual void paintEvent( QPaintEvent * _pe );
virtual void wheelEvent( QWheelEvent * _we );
virtual bool allowRubberband( void ) const;

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();
}
@@ -1753,11 +1752,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
}
@@ -1776,6 +1773,7 @@ void track::removeTCO( trackContentObject * _tco )
{
m_trackContentObjects.erase( it );
emit trackContentObjectRemoved( _tco );
engine::getSong()->updateLength();
engine::getSong()->setModified();
}
}

19
src/gui/song_editor.cpp
View File

@@ -249,6 +249,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 );
@@ -377,15 +379,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( _we->modifiers() & Qt::ControlModifier )
@@ -428,6 +421,14 @@ void songEditor::wheelEvent( QWheelEvent * _we )
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