Skip to content

FadeButtons now remain partially lit as a note plays out #4969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhysSong merged 19 commits into from
Jun 25, 2019
Merged

FadeButtons now remain partially lit as a note plays out #4969

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
47b492e
Add a note counter to FadeButton
enp2s0 May 9, 2019
bddd7d2
color fade logic for held notes
enp2s0 May 9, 2019
7f4618b
remove unnecessary timer
enp2s0 May 9, 2019
adda89d
add noteEnd() signal and emit it
enp2s0 May 9, 2019
b3da0ce
undo rename
enp2s0 May 9, 2019
69bbd44
convert spaces->tabs
enp2s0 May 9, 2019
d19be50
more spaces->tabs
enp2s0 May 9, 2019
75965d4
one more space->tab
enp2s0 May 9, 2019
1ffcbd2
one more space->tab
enp2s0 May 9, 2019
ecaa159
Final formatting fixes
enp2s0 May 9, 2019
7299809
Add an ADSR "release" fade when all notes are released
enp2s0 May 14, 2019
c08af15
Fix misleading comments
enp2s0 May 14, 2019
ae59c58
Fix a formatting issue
enp2s0 May 14, 2019
65e0280
Factor out fade logic into seperate function
enp2s0 Jun 8, 2019
478a453
Add comments describing the 3 colors
enp2s0 Jun 8, 2019
55f8007
Reinsert removed space
enp2s0 Jun 10, 2019
8345e0e
Reinsert removed space
enp2s0 Jun 10, 2019
1c3065a
better formatting
enp2s0 Jun 23, 2019
a920f5a
better formatting pt 2
enp2s0 Jun 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
better formatting pt 2
  • Loading branch information
@enp2s0
enp2s0 committed Jun 23, 2019
commit a920f5a750f9a8afbfe6d1159964a0ecf154b60c
14 changes: 7 additions & 7 deletions src/gui/widgets/FadeButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@
const float FadeDuration = 300;


FadeButton::FadeButton( const QColor & _normal_color,
const QColor & _activated_color,
const QColor & holdColor,
QWidget * _parent ) :
FadeButton::FadeButton(const QColor & _normal_color,
const QColor & _activated_color,
const QColor & holdColor,
QWidget * _parent) :
QAbstractButton( _parent ),
m_stateTimer(),
m_releaseTimer(),
m_normalColor( _normal_color ),
m_activatedColor( _activated_color ),
m_holdColor( holdColor )
{
setAttribute( Qt::WA_OpaquePaintEvent, true );
setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
setFocusPolicy( Qt::NoFocus );
setAttribute(Qt::WA_OpaquePaintEvent, true);
setCursor(QCursor(embed::getIconPixmap("hand"), 3, 3));
setFocusPolicy(Qt::NoFocus);
activeNotes = 0;
}

Expand Down