Skip to content

Enable track-wide color coding #5573

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
Spekular merged 77 commits into from
Oct 20, 2020
Merged

Enable track-wide color coding #5573

Changes from 2 commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
0125289
Enable track-wide color coding
ryuukumar Jul 10, 2020
ac99a20
Add support for automation tracks
ryuukumar Jul 11, 2020
34388c1
Allow saving & loading track colors
ryuukumar Jul 11, 2020
7efa117
Allow track color to be reset to default
ryuukumar Jul 12, 2020
22299d4
Merge pull request #12 from LMMS/master
ryuukumar Jul 12, 2020
c6e8368
Partially migrate common settings to Track.cpp, fix bug
ryuukumar Jul 13, 2020
ae5f55c
Merge pull request #13 from LMMS/master
ryuukumar Jul 13, 2020
5a4d713
Merge pull request #14 from LMMS/master
ryuukumar Jul 14, 2020
b9a5fd8
Completely migrate local TCO color functions to TCO class, fix bug
ryuukumar Jul 14, 2020
9846089
Set QColorDialog colors to better colors
ryuukumar Jul 14, 2020
006a541
Color the side of the track according to TCO colors
ryuukumar Jul 15, 2020
1765938
Disable color gradient when muted
ryuukumar Jul 15, 2020
5cb48b8
Change selection color to depend on TCO color
ryuukumar Jul 15, 2020
aab2dd5
Fix breaking builds
ryuukumar Jul 16, 2020
9e3e81b
Bug fix
ryuukumar Jul 16, 2020
fbedb42
Fix another bug where BB track colors wouldn't load
ryuukumar Jul 16, 2020
c01581c
Restore changed demo to original state
ryuukumar Jul 16, 2020
a30566b
Fix BB Editor bug
ryuukumar Jul 16, 2020
79e42d6
Fix breaking builds
ryuukumar Jul 16, 2020
d3aebd3
Merge pull request #15 from LMMS/master
ryuukumar Jul 17, 2020
1035594
Allow random color picking
ryuukumar Jul 18, 2020
b500fac
Merge branch 'color-exp' of https://github.com/russiankumar/lmms into…
ryuukumar Jul 18, 2020
7481b8b
Fix copy-paste bug
ryuukumar Jul 20, 2020
9977740
Change how color is painted on a track
ryuukumar Jul 20, 2020
221992a
Merge pull request #16 from LMMS/master
ryuukumar Jul 20, 2020
b76d0c0
Cleanup, and implement per-pattern colors
ryuukumar Jul 21, 2020
9f7c2ea
Cleanup comments
ryuukumar Jul 22, 2020
af3f8ea
Merge pull request #17 from LMMS/master
ryuukumar Jul 22, 2020
44f1eb7
Migrate some functions
ryuukumar Jul 27, 2020
ca9608c
Remove redundant function
ryuukumar Jul 27, 2020
9bca5cd
Merge pull request #22 from LMMS/master
ryuukumar Aug 2, 2020
3a30096
Rename some functions
ryuukumar Aug 2, 2020
9293a15
Migrate duplicates to superclass
ryuukumar Aug 10, 2020
6a5e4a0
Merge pull request #24 from LMMS/master
ryuukumar Aug 10, 2020
05c42fd
Merge pull request #25 from LMMS/master
ryuukumar Aug 11, 2020
2eab5df
Use ColorChooser and reorder some includes
ryuukumar Aug 14, 2020
cc453d8
Change how colors are saved
ryuukumar Aug 14, 2020
f9d867d
Fix some formatting
ryuukumar Aug 14, 2020
d59d4fc
Fix some code
ryuukumar Aug 15, 2020
6dea3ab
Change how clip colors work
ryuukumar Aug 16, 2020
25edb51
Fix some unexpected behaviors
ryuukumar Aug 17, 2020
54295df
Fix note border coloring being green on colored tracks
ryuukumar Aug 17, 2020
c3860ee
Change name of an option
ryuukumar Aug 18, 2020
a9d6256
Remove redundant code
ryuukumar Aug 28, 2020
4b1d126
Fix ghost changes
ryuukumar Aug 28, 2020
e99ff57
Remove colorRgb
ryuukumar Aug 28, 2020
3b0aaf0
Rename backgroundColor, remove some variables we don't use
ryuukumar Aug 28, 2020
368fd1e
Remove a redundant variable
ryuukumar Aug 28, 2020
1bf904a
Migrate some duplicates to superclass
ryuukumar Aug 28, 2020
ed3884b
Check for nullpointer
ryuukumar Sep 11, 2020
391550d
Remove redundant variable
ryuukumar Sep 11, 2020
83bcbe9
Merge branch 'master' into color-exp
ryuukumar Sep 13, 2020
d8ee30f
Update some logic
ryuukumar Sep 13, 2020
7d06af1
Change how muted colors are displayed
ryuukumar Sep 16, 2020
1c672c6
Change how dark muted tracks become
ryuukumar Sep 16, 2020
a0db1f6
Merge branch 'master' into color-exp
ryuukumar Sep 25, 2020
25688c0
Place setModified() in appropriate places
ryuukumar Sep 25, 2020
c5ef164
Make getColorForDisplay() function
ryuukumar Sep 25, 2020
be89ef2
Change how colors are organised and saved
ryuukumar Sep 25, 2020
a601b50
Remove m_useStyleColor
ryuukumar Sep 29, 2020
747528e
Remove a comment
ryuukumar Sep 30, 2020
9515a66
Quick changes
ryuukumar Oct 1, 2020
8e780ec
Change how colors are saved
ryuukumar Oct 1, 2020
1fcb161
Remove redundant stuff
ryuukumar Oct 3, 2020
5492049
Remove redundant stuff pt. 2
ryuukumar Oct 3, 2020
a341ee9
Change how colors are copied
ryuukumar Oct 3, 2020
eff524b
Fixes pt. 3
ryuukumar Oct 4, 2020
e9a49f8
Fixes pt. 4
ryuukumar Oct 4, 2020
25f1e9c
Change spaces to tabs
ryuukumar Oct 4, 2020
1c06c17
Fix pseudochanges
ryuukumar Oct 4, 2020
c518669
Remove s_lastTCOColor
ryuukumar Oct 5, 2020
d53dd00
Fix pseudochanges pt. 2
ryuukumar Oct 5, 2020
55bbe67
Fix breaking builds
ryuukumar Oct 5, 2020
602ea8d
Add files via upload
ryuukumar Oct 8, 2020
cf75570
Edit demo
ryuukumar Oct 8, 2020
75617d5
Merge pull request #27 from LMMS/master
ryuukumar Oct 8, 2020
01ffe71
Add comments (again)
ryuukumar Oct 18, 2020
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

These merge commits were added into this branch cleanly.

There are no new changes to show.