Skip to content
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.

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

Tweaking Pattern and Song editor #1544

Merged
Show file tree
Hide file tree
Changes from 54 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
972a6bf
pattern lock button & SEPanel interaction
theGreatWhiteShark Feb 9, 2022
d809398
lock PatternEditor + SongEditor tweaks
theGreatWhiteShark Feb 10, 2022
6ab2e76
align and tweak song and pattern editor
theGreatWhiteShark Feb 11, 2022
3fee9e4
refine behavior of pattern editor locked button
theGreatWhiteShark Feb 11, 2022
6348251
fine-tune rulers
theGreatWhiteShark Feb 11, 2022
c768ac0
some more highlighting when hovered
theGreatWhiteShark Feb 11, 2022
c028262
PatternEditorInstrumentList: immediate update on instrument change
theGreatWhiteShark Feb 28, 2022
45fe257
tweak pattern&instrument list UI
theGreatWhiteShark Mar 1, 2022
5b149e8
Ruler update: show cursor + SEPR redesign
theGreatWhiteShark Mar 2, 2022
1bd2c4d
fix selection highlighting
theGreatWhiteShark Mar 3, 2022
4e5c82d
Merge remote-tracking branch 'origin/master' into phil-editor-ui-tweaks
theGreatWhiteShark Mar 3, 2022
a9f378f
first draft of playhead rendering
theGreatWhiteShark Mar 3, 2022
21bbbe5
Skin: more pronounced list item borders
theGreatWhiteShark Mar 12, 2022
733097e
Editors: ruler updates + small tweaks
theGreatWhiteShark Mar 12, 2022
0c45113
PatternEditor: caching, redrawing, fix
theGreatWhiteShark Mar 13, 2022
94cb1f5
Timeline: fix activation
theGreatWhiteShark Mar 14, 2022
e90a6cd
Object: default value for toQString
theGreatWhiteShark Mar 14, 2022
59c353b
Timeline: add toQString() to TempoMarker and Tag
theGreatWhiteShark Mar 14, 2022
9b189e6
AudioEngine: fix pattern start tick calculation
theGreatWhiteShark Mar 14, 2022
317429c
introduce full-height playhead
theGreatWhiteShark Mar 14, 2022
62929a8
show playhead in playbackTrackWaveDisplay
theGreatWhiteShark Mar 14, 2022
5cf7839
PatternEditor: more efficient playhead update
theGreatWhiteShark Mar 14, 2022
18920d0
extend full-height playhead to automationPathView
theGreatWhiteShark Mar 15, 2022
bdae641
Theme: expose cursor color
theGreatWhiteShark Mar 15, 2022
e7bf9a7
tweak selection highlighting
theGreatWhiteShark Mar 15, 2022
5f32015
Theme: expose colors to fill notes in PatternEditor
theGreatWhiteShark Mar 15, 2022
357c083
Preferences: make color nodes translatable
theGreatWhiteShark Mar 15, 2022
dd4884a
SongEditor: fix stack mode activation
theGreatWhiteShark Mar 15, 2022
967ecdd
SongEditor: render stacked mode indicator + expose colors
theGreatWhiteShark Mar 15, 2022
f81b4ae
NotePropertiesRuler: add missing status messages
theGreatWhiteShark Mar 15, 2022
dc5dd56
PatternEditor: fixes
theGreatWhiteShark Mar 15, 2022
d7d43cc
PianoRollEditor: fixes, color theme + octaveRowColor
theGreatWhiteShark Mar 16, 2022
8c5e8f2
Theme: expose selected row text color
theGreatWhiteShark Mar 16, 2022
06227c6
NotePropertiesRuler: reworked update & shared design
theGreatWhiteShark Mar 16, 2022
6ec3a08
Merge remote-tracking branch 'origin/master' into phil-editor-ui-tweaks
theGreatWhiteShark Mar 16, 2022
a86ec3e
fix merge hiccups
theGreatWhiteShark Mar 16, 2022
036b9d7
update playing patterns when switching to pattern mode
theGreatWhiteShark Mar 16, 2022
ec30e7e
Editors: align cursor hiding
theGreatWhiteShark Mar 16, 2022
1ec0937
PianoRollEditor: status msg on property change& prob
theGreatWhiteShark Mar 17, 2022
8fa1228
fix EVENT_SELECTED_PATTERN_CHANGED and EVENT_PATTERN_MODIFIED
theGreatWhiteShark Mar 17, 2022
bf34ac1
SongEditor: fix cursor position on startup
theGreatWhiteShark Mar 18, 2022
86838f8
PatternEditorRuler: always show playhead
theGreatWhiteShark Mar 18, 2022
f5badc1
AudioEngine: two consistent states
theGreatWhiteShark Mar 21, 2022
4228e82
Song: move selected/stacked mode toggle into Song
theGreatWhiteShark Mar 21, 2022
86db1f8
SongEditorPositionRuler: support active range
theGreatWhiteShark Mar 21, 2022
43af750
PatternEditor: show full playing patterns
theGreatWhiteShark Mar 21, 2022
6da516b
SongEditorPositionRuler: add missing updates
theGreatWhiteShark Mar 22, 2022
14850a8
PatternEditor: note property change
theGreatWhiteShark Mar 23, 2022
5394c44
test: relax AudioEngine tests
theGreatWhiteShark Mar 23, 2022
1ff8525
Logger: fix bug in flush()
theGreatWhiteShark Mar 23, 2022
eb52714
Merge remote-tracking branch 'origin/master' into phil-editor-ui-tweaks
theGreatWhiteShark Mar 23, 2022
6e580a4
update ChangeLog
theGreatWhiteShark Mar 23, 2022
f387fbe
SongEditorRuler: playhead visibility
theGreatWhiteShark Mar 23, 2022
1d380a6
SongEditor: only toggle pattern in stacked mode
theGreatWhiteShark Mar 23, 2022
beffe51
Skin: fix playhead shaft calc.
theGreatWhiteShark Mar 24, 2022
8d0f018
Rulers: fill whole background
theGreatWhiteShark Mar 24, 2022
d02acd6
Editors: fine-tuning line placement
theGreatWhiteShark Mar 24, 2022
ef5fe3d
fix pixelRatio dependent rendering
theGreatWhiteShark Mar 24, 2022
65c2c68
editors: UI fine-tuning
theGreatWhiteShark Mar 24, 2022
6a10a5c
Merge branch 'master' into phil-editor-ui-tweaks
theGreatWhiteShark Mar 24, 2022
d45e96d
Merge branch 'master' into phil-editor-ui-tweaks
theGreatWhiteShark Mar 28, 2022
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
29 changes: 29 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,35 @@
- The tempo used left of the first tempo marker is painted in a
darker color.
- The currently used Tempo Marker gets highlighted.
- Tags have been moved into Timeline (next to the Tempo Markers)
in order to make room to accommodate the cursor in the ruler to
highlight the current position
- Tags can be inserted by left-clicking the bottom area of the
Timeline (above the ruler).
- Clicking the ruler is now always enabled and automatically
switches transport into Song Mode.
- Full-size playhead
- The icons in the pattern list indicating whether a pattern is
playing in stacked pattern mode are now colored and can have four
different states: on, off, off next (pattern is played till the
end and then turned off), and on next (pattern is played as soon
as transport is looped again)
* PatternEditor UX tweaks:
- Relocating transport by clicking the ruler is now supported
(like in the SongEditor) and automatically switches transport
into Pattern Mode.
- Full-size playhead
- The ruler was decoupled from the currently selected pattern. It
always has the size of the largest playing pattern and always
shows the transport position using a playhead. Whether or not the
current pattern is played back is indicated by a full-height
cursor.
- All note properties except of the note key can now be altered in
both the drum pattern editor and the piano roll editor by
right-clicking and dragging a note.
- All notes of the currently playing patterns will be hinted in
stacked pattern mode. Even those exceeding the length of the
current pattern.
* OSC API
- Add command /Hydrogen/LOAD_DRUMKIT
- Add command /Hydrogen/UPGRADE_DRUMKIT
Expand Down
Binary file removed data/img/gray/patternEditor/instrument_line.png
Binary file not shown.
Binary file not shown.
Binary file removed data/img/gray/patternEditor/tickPosition.png
Binary file not shown.
Binary file removed data/img/gray/songEditor/playingPattern_empty.png
Binary file not shown.
Binary file removed data/img/gray/songEditor/playingPattern_off.png
Binary file not shown.
Binary file removed data/img/gray/songEditor/playingPattern_on.png
Binary file not shown.
Binary file removed data/img/gray/songEditor/songEditorLabelABG.png
Binary file not shown.
Binary file removed data/img/gray/songEditor/songEditorLabelBG.png
Binary file not shown.
Binary file removed data/img/gray/songEditor/songEditorLabelSBG.png
Binary file not shown.
120 changes: 120 additions & 0 deletions data/img/scalable/icons/black/lock_closed.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
128 changes: 128 additions & 0 deletions data/img/scalable/icons/black/lock_open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading