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

Merge branch 'stable-1.2'

Browse Source
This commit is contained in:
Lukas W
2017-04-07 11:41:27 +02:00
parent 96a00300e8 e65b1c8ba8
commit c7ce554ea1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/SampleBuffer.cpp
View File

@@ -152,7 +152,7 @@ SampleBuffer::~SampleBuffer()
void SampleBuffer::sampleRateChanged()
{
update();
update( true );
}

7
src/gui/widgets/TrackLabelButton.cpp
View File

@@ -48,7 +48,9 @@ TrackLabelButton::TrackLabelButton( TrackView * _tv, QWidget * _parent ) :
setAcceptDrops( true );
setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
m_renameLineEdit = new QLineEdit( this );
m_renameLineEdit->hide();
if( ConfigManager::inst()->value( "ui", "compacttrackbuttons" ).toInt() )
{
setFixedSize( 32, 29 );
@@ -56,12 +58,11 @@ TrackLabelButton::TrackLabelButton( TrackView * _tv, QWidget * _parent ) :
else
{
setFixedSize( 160, 29 );
m_renameLineEdit = new QLineEdit( this );
m_renameLineEdit->move( 30, ( height() / 2 ) - ( m_renameLineEdit->sizeHint().height() / 2 ) );
m_renameLineEdit->setFixedWidth( width() - 33 );
m_renameLineEdit->hide();
connect( m_renameLineEdit, SIGNAL( editingFinished() ), this, SLOT( renameFinished() ) );
}
setIconSize( QSize( 24, 24 ) );
connect( m_trackView->getTrack(), SIGNAL( dataChanged() ), this, SLOT( update() ) );
connect( m_trackView->getTrack(), SIGNAL( nameChanged() ), this, SLOT( nameChanged() ) );