From 951b6e3cbff7c3eeacfbfbb0b9c7046f9d3cb8b4 Mon Sep 17 00:00:00 2001 From: aakers24 Date: Mon, 10 Oct 2022 16:37:56 -0700 Subject: [PATCH 1/4] Added automatic dark note on light background for midi clips. --- src/gui/clips/MidiClipView.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/clips/MidiClipView.cpp b/src/gui/clips/MidiClipView.cpp index e3ef9fd20b9..26ceaea59a6 100644 --- a/src/gui/clips/MidiClipView.cpp +++ b/src/gui/clips/MidiClipView.cpp @@ -523,7 +523,8 @@ void MidiClipView::paintEvent( QPaintEvent * ) p.scale(width(), height() - distanceToTop - 2 * notesBorder); // set colour based on mute status - QColor noteFillColor = muted ? getMutedNoteFillColor() : getNoteFillColor(); + QColor noteFillColor = muted ? getMutedNoteFillColor() + : (c.lightness() > 127 ? getNoteFillColor().darker(400) : getNoteFillColor()); QColor noteBorderColor = muted ? getMutedNoteBorderColor() : ( m_clip->hasColor() ? c.lighter( 200 ) : getNoteBorderColor() ); From 7beeac0e12f2129e2c292d7cc50317d0035aec32 Mon Sep 17 00:00:00 2001 From: aakers24 Date: Mon, 10 Oct 2022 22:11:24 -0700 Subject: [PATCH 2/4] Added mute functionality to automatic dark note on light background for midi clips. --- src/gui/clips/MidiClipView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/clips/MidiClipView.cpp b/src/gui/clips/MidiClipView.cpp index 26ceaea59a6..1691263517f 100644 --- a/src/gui/clips/MidiClipView.cpp +++ b/src/gui/clips/MidiClipView.cpp @@ -523,7 +523,7 @@ void MidiClipView::paintEvent( QPaintEvent * ) p.scale(width(), height() - distanceToTop - 2 * notesBorder); // set colour based on mute status - QColor noteFillColor = muted ? getMutedNoteFillColor() + QColor noteFillColor = muted ? getMutedNoteFillColor().lighter(150) : (c.lightness() > 127 ? getNoteFillColor().darker(400) : getNoteFillColor()); QColor noteBorderColor = muted ? getMutedNoteBorderColor() : ( m_clip->hasColor() ? c.lighter( 200 ) : getNoteBorderColor() ); From b224f4dafa4bbd94855ef13bed00a29e98cf4a9e Mon Sep 17 00:00:00 2001 From: aakers24 Date: Fri, 14 Oct 2022 15:21:34 -0700 Subject: [PATCH 3/4] Adjusted muted clip note lightness for visibility. --- src/gui/clips/MidiClipView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/clips/MidiClipView.cpp b/src/gui/clips/MidiClipView.cpp index 1691263517f..ea847c46419 100644 --- a/src/gui/clips/MidiClipView.cpp +++ b/src/gui/clips/MidiClipView.cpp @@ -523,7 +523,7 @@ void MidiClipView::paintEvent( QPaintEvent * ) p.scale(width(), height() - distanceToTop - 2 * notesBorder); // set colour based on mute status - QColor noteFillColor = muted ? getMutedNoteFillColor().lighter(150) + QColor noteFillColor = muted ? getMutedNoteFillColor().lighter(200) : (c.lightness() > 127 ? getNoteFillColor().darker(400) : getNoteFillColor()); QColor noteBorderColor = muted ? getMutedNoteBorderColor() : ( m_clip->hasColor() ? c.lighter( 200 ) : getNoteBorderColor() ); From c2d02bbc82b4561dc0cae26dbd61b81e5bbf6d69 Mon Sep 17 00:00:00 2001 From: aakers24 Date: Sat, 16 Sep 2023 22:18:46 -0700 Subject: [PATCH 4/4] Adjusted the lightness threshold for note darkening on light clips to prefer lighter notes in order to maintain the original look and feel. --- src/gui/clips/MidiClipView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/clips/MidiClipView.cpp b/src/gui/clips/MidiClipView.cpp index 1e5c9691ee8..151df8d3c3c 100644 --- a/src/gui/clips/MidiClipView.cpp +++ b/src/gui/clips/MidiClipView.cpp @@ -524,7 +524,7 @@ void MidiClipView::paintEvent( QPaintEvent * ) // set colour based on mute status QColor noteFillColor = muted ? getMutedNoteFillColor().lighter(200) - : (c.lightness() > 127 ? getNoteFillColor().darker(400) : getNoteFillColor()); + : (c.lightness() > 175 ? getNoteFillColor().darker(400) : getNoteFillColor()); QColor noteBorderColor = muted ? getMutedNoteBorderColor() : ( m_clip->hasColor() ? c.lighter( 200 ) : getNoteBorderColor() );