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.

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

Jump to bottom

improve rendering of waveform marks #12203

Merged
merged 13 commits into from Nov 5, 2023
Merged

improve rendering of waveform marks #12203

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8391e9d
auto-scale and improve align of symbol markers, additional changes: r…
m0dB Oct 19, 2023
7149759
fix vertical orientation
m0dB Oct 21, 2023
32203af
missing headers, missing type cast
m0dB Oct 21, 2023
50990db
optionally use an svg for the mark icon instead of text
m0dB Oct 28, 2023
17f0f19
WaveformMark::Graphics can either be ImageGraphics or TextureGraphics…
m0dB Oct 28, 2023
494c360
add icons for intro and outro
m0dB Oct 28, 2023
07b6389
plain svg
m0dB Nov 4, 2023
dd36ac0
Text as fallback
m0dB Nov 4, 2023
2a03c50
corrected a comment
m0dB Nov 4, 2023
7d32e40
removed unnecessary scoping
m0dB Nov 4, 2023
e7aeb02
removed commented code
m0dB Nov 4, 2023
efaf97d
prefer useIcon over symbol
m0dB Nov 4, 2023
3132017
removed in-class initialization
m0dB Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions res/skins/LateNight/classic/style/mark_intro.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions res/skins/LateNight/classic/style/mark_loop.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions res/skins/LateNight/classic/style/mark_outro.svg
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 10 additions & 5 deletions res/skins/LateNight/waveform.xml
View file
Open in desktop
Expand Up @@ -62,7 +62,8 @@
</MarkRange>
<Mark>
<Control>loop_start_position</Control>
<Text>&#8635;</Text>
<!--Text>&#8635;</Text-->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove comments now that we are using the svg files

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure about this (here). sometimes it's helpful to have the matching unicode char at hand.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I agree, the Text should be fallback. I will revert the commenting.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

<Icon>skin:../LateNight/classic/style/mark_loop.svg</Icon>
<Align>top|left</Align>
<Color><Variable name="LoopColor"/></Color>
<TextColor>#FFFFFF</TextColor>
Expand All @@ -86,7 +87,8 @@
</MarkRange>
<Mark>
<Control>intro_start_position</Control>
<Text>&#9698;</Text>
<!--Text>&#9698;</Text-->
<Icon>skin:../LateNight/classic/style/mark_intro.svg</Icon>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Align>top|right</Align>
<Color><Variable name="IntroOutroColor"/></Color>
Expand All @@ -95,7 +97,8 @@
<Mark>
<Control>intro_end_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text>&#9698;</Text>
<!--Text>&#9698;</Text-->
<Icon>skin:../LateNight/classic/style/mark_intro.svg</Icon>
<Align>top|left</Align>
<Color><Variable name="IntroOutroColor"/></Color>
<TextColor>#FFFFFF</TextColor>
Expand All @@ -113,14 +116,16 @@
<Mark>
<Control>outro_start_position</Control>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Text>&#9699;</Text>
<!--Text>&#9699;</Text-->
<Icon>skin:../LateNight/classic/style/mark_outro.svg</Icon>
<Align>top|right</Align>
<Color><Variable name="IntroOutroColor"/></Color>
<TextColor>#FFFFFF</TextColor>
</Mark>
<Mark>
<Control>outro_end_position</Control>
<Text>&#9699;</Text>
<!--Text>&#9699;</Text-->
<Icon>skin:../LateNight/classic/style/mark_outro.svg</Icon>
<VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
<Align>top|left</Align>
<Color><Variable name="IntroOutroColor"/></Color>
Expand Down