From 17df759e597aa2f29d5cab9a2e3859af957c091c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Ranft?= Date: Fri, 19 Dec 2014 16:54:37 +0100 Subject: [PATCH 1/2] Fixed the brush initialization. The brushes are now initialized as solid colored, in order to fix drawing problems. --- src/core/track.cpp | 4 +++- src/gui/AutomationEditor.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/track.cpp b/src/core/track.cpp index 510f2dec6..3c612e6b1 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -847,7 +847,9 @@ void trackContentObjectView::setAutoResizeEnabled( bool _e ) */ trackContentWidget::trackContentWidget( trackView * _parent ) : QWidget( _parent ), - m_trackView( _parent ) + m_trackView( _parent ), + m_darkerColor( Qt::SolidPattern ), + m_lighterColor( Qt::SolidPattern ) { setAcceptDrops( true ); diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp index 71abe18c1..c9c003b28 100644 --- a/src/gui/AutomationEditor.cpp +++ b/src/gui/AutomationEditor.cpp @@ -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() ), From 7cc080efbdc93c157fb12eb0ff8cf4d623847c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Ranft?= Date: Fri, 19 Dec 2014 17:13:29 +0100 Subject: [PATCH 2/2] Added the initialization of the active mixer brush. --- src/gui/widgets/FxLine.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/widgets/FxLine.cpp b/src/gui/widgets/FxLine.cpp index 36baa782f..8f39af38c 100644 --- a/src/gui/widgets/FxLine.cpp +++ b/src/gui/widgets/FxLine.cpp @@ -46,7 +46,8 @@ QPixmap * FxLine::s_receiveBgArrow = NULL; FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex) : QWidget( _parent ), m_mv( _mv ), - m_channelIndex( _channelIndex ) + m_channelIndex( _channelIndex ), + m_backgroundActive( Qt::SolidPattern ) { if( ! s_sendBgArrow ) {