Merge Brush-Bugfix

This commit is contained in:
Rüdiger Ranft
2014-12-19 17:00:09 +01:00
2 changed files with 5 additions and 3 deletions

View File

@@ -998,7 +998,9 @@ bool TrackContentObjectView::mouseMovedDistance( QMouseEvent * _me, int distance
*/
TrackContentWidget::TrackContentWidget( TrackView * _parent ) :
QWidget( _parent ),
m_trackView( _parent )
m_trackView( _parent ),
m_darkerColor( Qt::SolidPattern ),
m_lighterColor( Qt::SolidPattern )
{
setAcceptDrops( true );

View File

@@ -98,9 +98,9 @@ AutomationEditor::AutomationEditor() :
m_editMode( DRAW ),
m_scrollBack( false ),
m_gridColor( 0,0,0 ),
m_graphColor(),
m_graphColor( Qt::SolidPattern ),
m_vertexColor( 0,0,0 ),
m_scaleColor()
m_scaleColor( Qt::SolidPattern )
{
connect( this, SIGNAL( currentPatternChanged() ),
this, SLOT( updateAfterPatternChange() ),