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

Merge pull request #2547 from Umcaruje/fxline

Browse Source 
Make FxLine Stroke Themeable
This commit is contained in:
Umcaruje
2016-02-20 14:40:48 +01:00
parent 95b0ea2dda e24384e732
commit 0561d8d994
3 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/themes/default/style.css
View File

@@ -514,6 +514,10 @@ FxLine {
color: #e0e0e0;
qproperty-backgroundActive: qlineargradient(spread:reflect, x1:0, y1:0, x2:1, y2:0,
stop:0 #7b838d, stop:1 #6b7581 );
qproperty-strokeOuterActive: rgb( 0, 0, 0 );
qproperty-strokeOuterInactive: rgba( 0, 0, 0, 50 );
qproperty-strokeInnerActive: rgba( 255, 255, 255, 100 );
qproperty-strokeInnerInactive: rgba( 255, 255, 255, 50 );
}
/* persistent peak markers for fx peak meters */

21
include/FxLine.h
View File

@@ -41,6 +41,10 @@ class FxLine : public QWidget
Q_OBJECT
public:
Q_PROPERTY( QBrush backgroundActive READ backgroundActive WRITE setBackgroundActive )
Q_PROPERTY( QColor strokeOuterActive READ strokeOuterActive WRITE setStrokeOuterActive )
Q_PROPERTY( QColor strokeOuterInactive READ strokeOuterInactive WRITE setStrokeOuterInactive )
Q_PROPERTY( QColor strokeInnerActive READ strokeInnerActive WRITE setStrokeInnerActive )
Q_PROPERTY( QColor strokeInnerInactive READ strokeInnerInactive WRITE setStrokeInnerInactive )
FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex);
~FxLine();
@@ -57,6 +61,19 @@ public:
QBrush backgroundActive() const;
void setBackgroundActive( const QBrush & c );
QColor strokeOuterActive() const;
void setStrokeOuterActive( const QColor & c );
QColor strokeOuterInactive() const;
void setStrokeOuterInactive( const QColor & c );
QColor strokeInnerActive() const;
void setStrokeInnerActive( const QColor & c );
QColor strokeInnerInactive() const;
void setStrokeInnerInactive( const QColor & c );
static const int FxLineHeight;
@@ -67,6 +84,10 @@ private:
LcdWidget* m_lcd;
int m_channelIndex;
QBrush m_backgroundActive;
QColor m_strokeOuterActive;
QColor m_strokeOuterInactive;
QColor m_strokeInnerActive;
QColor m_strokeInnerInactive;
static QPixmap * s_sendBgArrow;
static QPixmap * s_receiveBgArrow;

53
src/gui/widgets/FxLine.cpp
View File

@@ -48,7 +48,11 @@ FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex) :
QWidget( _parent ),
m_mv( _mv ),
m_channelIndex( _channelIndex ),
m_backgroundActive( Qt::SolidPattern )
m_backgroundActive( Qt::SolidPattern ),
m_strokeOuterActive( 0, 0, 0 ),
m_strokeOuterInactive( 0, 0, 0 ),
m_strokeInnerActive( 0, 0, 0 ),
m_strokeInnerInactive( 0, 0, 0 )
{
if( ! s_sendBgArrow )
{
@@ -126,11 +130,13 @@ void FxLine::drawFxLine( QPainter* p, const FxLine *fxLine, const QString& name,
p->fillRect( fxLine->rect(), isActive ? fxLine->backgroundActive() : p->background() );
p->setPen( QColor( 255, 255, 255, isActive ? 100 : 50 ) );
// inner border
p->setPen( isActive ? fxLine->strokeInnerActive() : fxLine->strokeInnerInactive() );
p->drawRect( 1, 1, width-3, height-3 );
p->setPen( isActive ? sh_color : QColor( 0, 0, 0, 50 ) );
// outer border
p->setPen( isActive ? fxLine->strokeOuterActive() : fxLine->strokeOuterInactive() );
p->drawRect( 0, 0, width-1, height-1 );
// draw the mixer send background
@@ -276,5 +282,42 @@ void FxLine::setBackgroundActive( const QBrush & c )
m_backgroundActive = c;
}
QColor FxLine::strokeOuterActive() const
{
return m_strokeOuterActive;
}
void FxLine::setStrokeOuterActive( const QColor & c )
{
m_strokeOuterActive = c;
}
QColor FxLine::strokeOuterInactive() const
{
return m_strokeOuterInactive;
}
void FxLine::setStrokeOuterInactive( const QColor & c )
{
m_strokeOuterInactive = c;
}
QColor FxLine::strokeInnerActive() const
{
return m_strokeInnerActive;
}
void FxLine::setStrokeInnerActive( const QColor & c )
{
m_strokeInnerActive = c;
}
QColor FxLine::strokeInnerInactive() const
{
return m_strokeInnerInactive;
}
void FxLine::setStrokeInnerInactive( const QColor & c )
{
m_strokeInnerInactive = c;
}