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

Merge pull request #2540 from Umcaruje/cssnotes

Browse Source 
Make the note border radius themeable, fix rendering of notes and volume/pan sliders
This commit is contained in:
Colin Wallace
2016-02-04 16:10:11 -08:00
parent 1228de750f 439ab30d51
commit f78b6a682a
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,6 +115,8 @@ PianoRoll {
qproperty-noteModeColor: rgb( 255, 255, 255 );
qproperty-noteColor: rgb( 119, 199, 216 );
qproperty-barColor: #4afd85;
qproperty-noteBorderRadiusX: 5;
qproperty-noteBorderRadiusY: 2;
}
/* main toolbar oscilloscope - can have transparent bg now */

12
include/PianoRoll.h
View File

@@ -57,6 +57,8 @@ class PianoRoll : public QWidget
Q_PROPERTY( QColor noteModeColor READ noteModeColor WRITE setNoteModeColor )
Q_PROPERTY( QColor noteColor READ noteColor WRITE setNoteColor )
Q_PROPERTY( QColor barColor READ barColor WRITE setBarColor )
Q_PROPERTY( float noteBorderRadiusX READ noteBorderRadiusX WRITE setNoteBorderRadiusX )
Q_PROPERTY( float noteBorderRadiusY READ noteBorderRadiusY WRITE setNoteBorderRadiusY )
public:
enum EditModes
{
@@ -109,6 +111,10 @@ public:
void setNoteColor( const QColor & c );
QColor barColor() const;
void setBarColor( const QColor & c );
float noteBorderRadiusX() const;
void setNoteBorderRadiusX( float b );
float noteBorderRadiusY() const;
void setNoteBorderRadiusY( float b );
protected:
@@ -126,7 +132,8 @@ protected:
int getKey( int y ) const;
static void drawNoteRect( QPainter & p, int x, int y,
int width, const Note * n, const QColor & noteCol );
int width, const Note * n, const QColor & noteCol,
float radiusX, float radiusY );
void removeSelection();
void selectAll();
NoteVector getSelectedNotes();
@@ -349,6 +356,8 @@ private:
QColor m_noteModeColor;
QColor m_noteColor;
QColor m_barColor;
float m_noteBorderRadiusX;
float m_noteBorderRadiusY;
signals:
void positionChanged( const MidiTime & );
@@ -408,4 +417,3 @@ private:
#endif

44
src/gui/editors/PianoRoll.cpp
View File

@@ -209,7 +209,9 @@ PianoRoll::PianoRoll() :
m_gridColor( 0, 0, 0 ),
m_noteModeColor( 0, 0, 0 ),
m_noteColor( 0, 0, 0 ),
m_barColor( 0, 0, 0 )
m_barColor( 0, 0, 0 ),
m_noteBorderRadiusX( 0 ),
m_noteBorderRadiusY( 0 )
{
// gui names of edit modes
m_nemStr.push_back( tr( "Note Volume" ) );
@@ -759,10 +761,22 @@ QColor PianoRoll::barColor() const
void PianoRoll::setBarColor( const QColor & c )
{ m_barColor = c; }
float PianoRoll::noteBorderRadiusX() const
{ return m_noteBorderRadiusX; }
void PianoRoll::setNoteBorderRadiusX( float b )
{ m_noteBorderRadiusX = b; }
float PianoRoll::noteBorderRadiusY() const
{ return m_noteBorderRadiusY; }
void PianoRoll::setNoteBorderRadiusY( float b )
{ m_noteBorderRadiusY = b; }
void PianoRoll::drawNoteRect(QPainter & p, int x, int y,
int width, const Note * n, const QColor & noteCol )
void PianoRoll::drawNoteRect(QPainter & p, int x, int y,
int width, const Note * n, const QColor & noteCol,
float radiusX, float radiusY )
{
++x;
++y;
@@ -804,15 +818,17 @@ void PianoRoll::drawNoteRect(QPainter & p, int x, int y,
p.setPen( col );
p.setRenderHint(QPainter::Antialiasing);
p.drawRoundedRect( x, y, width, KEY_LINE_HEIGHT-1, 5, 2 );
p.drawRoundedRect( QRectF ( x + 0.5, y - 0.5, width, KEY_LINE_HEIGHT ), radiusX, radiusY );
// that little tab thing on the end hinting at the user
// to resize the note
p.setPen( noteCol.lighter( 200 ) );
p.setBrush( noteCol.lighter( 200 ) );
if( width > 2 )
{
p.drawLine( x + width - 3, y + 3, x + width - 3,
y + KEY_LINE_HEIGHT - 5 );
float leftIndent = 2.5;
float vertIndent = 3.5;
p.drawRect( QRectF (x + width - leftIndent, y + vertIndent, 1, KEY_LINE_HEIGHT - (2*vertIndent + 1) ) );
}
}
@@ -2900,7 +2916,7 @@ void PianoRoll::paintEvent(QPaintEvent * pe )
const int visible_keys = ( keyAreaBottom()-keyAreaTop() ) /
KEY_LINE_HEIGHT + 2;
QPolygon editHandles;
QPolygonF editHandles;
for( const Note *note : m_pattern->notes() )
{
@@ -2936,7 +2952,7 @@ void PianoRoll::paintEvent(QPaintEvent * pe )
// note
drawNoteRect( p, x + WHITE_KEY_WIDTH,
y_base - key * KEY_LINE_HEIGHT,
note_width, note, noteColor() );
note_width, note, noteColor(), noteBorderRadiusX(), noteBorderRadiusY() );
}
// draw note editing stuff
@@ -2955,8 +2971,8 @@ void PianoRoll::paintEvent(QPaintEvent * pe )
( (float)( MaxVolume - MinVolume ) ) *
( (float)( noteEditBottom() - noteEditTop() ) );
p.drawLine( noteEditLeft() + x, editHandleTop,
noteEditLeft() + x, noteEditBottom() );
p.drawLine( QLineF ( noteEditLeft() + x + 0.5, editHandleTop + 0.5,
noteEditLeft() + x + 0.5, noteEditBottom() + 0.5 ) );
}
else if( m_noteEditMode == NoteEditPanning )
@@ -2974,12 +2990,12 @@ void PianoRoll::paintEvent(QPaintEvent * pe )
( (float)( (PanningRight - PanningLeft ) ) ) *
( (float)( noteEditBottom() - noteEditTop() ) );
p.drawLine( noteEditLeft() + x, noteEditTop() +
p.drawLine( QLineF( noteEditLeft() + x + 0.5, noteEditTop() + 0.5 +
( (float)( noteEditBottom() - noteEditTop() ) ) / 2.0f,
noteEditLeft() + x, editHandleTop );
noteEditLeft() + x + 0.5, editHandleTop + 0.5 ) );
}
editHandles << QPoint( x + noteEditLeft(),
editHandleTop+1 );
editHandles << QPointF ( x + noteEditLeft() + 0.5,
editHandleTop + 1.5 );
if( note->hasDetuningInfo() )
{