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

Get rid of hardcoded colors in the Piano Roll and Automation Editor

Browse Source
This commit is contained in:
Umcaruje
2016-02-08 19:44:50 +01:00
parent 317cc74bac
commit d52d7d9fb7
5 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/AutomationEditor.h
View File

@@ -55,6 +55,7 @@ class AutomationEditor : public QWidget, public JournallingObject
Q_PROPERTY(QColor vertexColor READ vertexColor WRITE setVertexColor)
Q_PROPERTY(QBrush scaleColor READ scaleColor WRITE setScaleColor)
Q_PROPERTY(QBrush graphColor READ graphColor WRITE setGraphColor)
Q_PROPERTY(QColor crossColor READ crossColor WRITE setCrossColor)
public:
void setCurrentPattern(AutomationPattern * new_pattern);
@@ -80,10 +81,12 @@ public:
QBrush graphColor() const;
QColor vertexColor() const;
QBrush scaleColor() const;
QColor crossColor() const;
void setGridColor(const QColor& c);
void setGraphColor(const QBrush& c);
void setVertexColor(const QColor& c);
void setScaleColor(const QBrush& c);
void setCrossColor(const QColor& c);
enum EditModes
{
@@ -237,6 +240,7 @@ private:
QBrush m_graphColor;
QColor m_vertexColor;
QBrush m_scaleColor;
QColor m_crossColor;
friend class AutomationEditorWindow;

22
include/PianoRoll.h
View File

@@ -59,6 +59,11 @@ class PianoRoll : public QWidget
Q_PROPERTY( QColor barColor READ barColor WRITE setBarColor )
Q_PROPERTY( float noteBorderRadiusX READ noteBorderRadiusX WRITE setNoteBorderRadiusX )
Q_PROPERTY( float noteBorderRadiusY READ noteBorderRadiusY WRITE setNoteBorderRadiusY )
Q_PROPERTY( QColor selectedNoteColor READ selectedNoteColor WRITE setSelectedNoteColor )
Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )
Q_PROPERTY( QColor textColorLight READ textColorLight WRITE setTextColorLight )
Q_PROPERTY( QColor textShadow READ textShadow WRITE setTextShadow )
Q_PROPERTY( QColor markedSemitoneColor READ markedSemitoneColor WRITE setMarkedSemitoneColor )
public:
enum EditModes
{
@@ -115,6 +120,16 @@ public:
void setNoteBorderRadiusX( float b );
float noteBorderRadiusY() const;
void setNoteBorderRadiusY( float b );
QColor selectedNoteColor() const;
void setSelectedNoteColor( const QColor & c );
QColor textColor() const;
void setTextColor( const QColor & c );
QColor textColorLight() const;
void setTextColorLight( const QColor & c );
QColor textShadow() const;
void setTextShadow( const QColor & c );
QColor markedSemitoneColor() const;
void setMarkedSemitoneColor( const QColor & c );
protected:
@@ -133,7 +148,7 @@ protected:
int getKey( int y ) const;
static void drawNoteRect( QPainter & p, int x, int y,
int width, const Note * n, const QColor & noteCol,
float radiusX, float radiusY );
float radiusX, float radiusY, const QColor & selCol );
void removeSelection();
void selectAll();
NoteVector getSelectedNotes();
@@ -358,6 +373,11 @@ private:
QColor m_barColor;
float m_noteBorderRadiusX;
float m_noteBorderRadiusY;
QColor m_selectedNoteColor;
QColor m_textColor;
QColor m_textColorLight;
QColor m_textShadow;
QColor m_markedSemitoneColor;
signals:
void positionChanged( const MidiTime & );