Skip to content

Add music track listing to ride music window#20980

Merged
AaronVanGeffen merged 19 commits into
OpenRCT2:developfrom
johnwdolph:ui
Jul 8, 2024
Merged

Add music track listing to ride music window#20980
AaronVanGeffen merged 19 commits into
OpenRCT2:developfrom
johnwdolph:ui

Conversation

@johnwdolph

@johnwdolph johnwdolph commented Nov 16, 2023

Copy link
Copy Markdown
Contributor

Applies issue #20832. Adds music object data (track names, authors and preview images) to the ride music window.

ride_music_windows

@johnwdolph johnwdolph changed the title Apply #20832: Add music data to ride music window Apply OpenRCT2#20832: Add music data to ride music window Nov 17, 2023
@johnwdolph johnwdolph changed the title Apply OpenRCT2#20832: Add music data to ride music window Apply #20832: Add music data to ride music window Nov 17, 2023
@karst

karst commented Nov 17, 2023

Copy link
Copy Markdown
Member

This looks really good! Great work! There's a few things that I'd recommend changing, they are mostly alignment issues.

Line up the top of the image with the Play Music icon (currently it's centered with the Tracklist, but the user won't expand this often enough to look proper) , this will also allow the author to be on a singular line, rather than taking up three lines.
I'd also move the author line to the bottom left instead of the bottom right.

The image is missing it's outline as seen in for example the object selector. This has to be re-added to allign with ui's standard. (It currently pops out, but it has to be inside a frame: the bottom is lighter and the top is darker).

I will make sure to playtest this right away and will leave another comment afterwards.

@karst

karst commented Nov 17, 2023

Copy link
Copy Markdown
Member

Photoshop edit
I made an edit of the window using photoshop of what the final result should look like.

I noticed while play testing that the image is dynamic within the window, but this one can be kept static in its y value.

By moving the Author to the bottom left rather than the bottom right it allows for the window to be slightly smaller, too and have less empty space.

UI is nice and responsive. No changes necessary there.

Hope the feedback helps! :)

@karst karst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested changes above.

@johnwdolph

Copy link
Copy Markdown
Contributor Author

Suggested changes above.

Just updated the code. It looks much cleaner now. Any more feedback is appreciated! :)

@karst karst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks really clean! I am very happy with this.

Ofcourse there's space for others if they have anything to add.

image
image

@tupaschoal tupaschoal left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Only reviewed half of it

Comment thread src/openrct2-ui/windows/Ride.cpp Outdated
Comment thread src/openrct2-ui/windows/Ride.cpp Outdated
Comment thread src/openrct2-ui/windows/Ride.cpp Outdated
Comment thread src/openrct2-ui/windows/Ride.cpp Outdated
@karst karst added user interface Has to do with user interfaces. changelog This issue/PR deserves a changelog entry. labels Dec 13, 2023
@tupaschoal

Copy link
Copy Markdown
Member

@karst do we want to add some string like "Composers" or "Performers" or something?

@karst

karst commented Dec 23, 2023

Copy link
Copy Markdown
Member

I don't think that's necessary. Most songs seperate artist from song using just a dash, which makes that clear enough.

Perhaps we should update the music objects to include Allister Brimble where necessary.

@Gymnasiast Gymnasiast added discussion Some input from team members is wanted. on hold A PR that should not be merged as is, waiting for a prerequisite. labels Dec 30, 2023
@Gymnasiast Gymnasiast self-requested a review January 1, 2024 00:48
@Basssiiie

Copy link
Copy Markdown
Member

Would it be possible to hide the scroll bars from the track list if there's no need to scroll?

Right now this tab seems very cluttered. 🥴

@karst

karst commented Jan 3, 2024

Copy link
Copy Markdown
Member

I was thinking,
I requested if all audio objects could have their composers listed. This has since been done.
I think it's no longer necessary to list the object author(s). This would clear up another line.

@johnwdolph

johnwdolph commented Jan 4, 2024

Copy link
Copy Markdown
Contributor Author

Would it be possible to hide the scroll bars from the track list if there's no need to scroll?

Right now this tab seems very cluttered. 🥴

Working on this now.

@github-actions

github-actions Bot commented Feb 5, 2024

Copy link
Copy Markdown

This pull request has been marked as stale and will be closed in 14 days if no action is taken. To keep it open, leave a comment or remove the stale-pr label. If you're awaiting feedback from a developer, please send us a reminder (either here or on Discord).

@karst karst removed the stale-pr label Feb 5, 2024
@karst karst removed the on hold A PR that should not be merged as is, waiting for a prerequisite. label Feb 27, 2024
@AaronVanGeffen

AaronVanGeffen commented Jul 6, 2024

Copy link
Copy Markdown
Member

Going over stale PRs, I came across this one. To be honest, I think this adds a lot of clutter to the UI. Thinking about it, I believe this has to do with seeing boldface black text on a red window. Perhaps it would look better using the 'Small' font style, rather than the default 'Medium' one? @karst, what do you think?

Before:
Forest Frontiers 2024-07-06 19-18-50

After:
Forest Frontiers 2024-07-06 19-18-21

Aside from the UI, I think the code needs a bit of cleaning up before this is ready to be merged. Considering how long this PR has been sitting for, I'm willing to take it to the finish line myself if need be, though.

@AaronVanGeffen AaronVanGeffen changed the title Apply #20832: Add music data to ride music window Add music track listing to ride music window Jul 6, 2024
@Gymnasiast Gymnasiast added this to the After v0.4.12 milestone Jul 6, 2024
@karst

karst commented Jul 6, 2024

Copy link
Copy Markdown
Member

The smaller text, which you've shown in the screenshot definitely looks cleaner.

The author on the bottom no longer needs to be shown there anymore since each song has it's componist listed since a few months now.

@karst

karst commented Jul 6, 2024

Copy link
Copy Markdown
Member

image

Photoshop

@AaronVanGeffen

AaronVanGeffen commented Jul 6, 2024

Copy link
Copy Markdown
Member

After some discussion with @Gymnasiast on Discord, we agreed it would be best to push the preview image down a little, such that it aligned horizontally with the track list. This would provide ample room for a future button next to the music dropdown above.

Here's a few screenshots with the current status as the rewrites I've pushed.

Music off:
Forest Frontiers 2024-07-06 21-16-21

Music on:
Forest Frontiers 2024-07-06 21-17-47

@AaronVanGeffen AaronVanGeffen added the squash merge A PR that should be squashed on merge. label Jul 6, 2024
@karst

karst commented Jul 6, 2024

Copy link
Copy Markdown
Member

Very nice, perhaps push the full window down by one or two more pixels so the resize icon doesn't overlap with other buttons?

@karst

karst commented Jul 6, 2024

Copy link
Copy Markdown
Member

I noticed one oddity when testing. If you click on another window the sideways scrollbar disappears.
image
image

@AaronVanGeffen

AaronVanGeffen commented Jul 8, 2024

Copy link
Copy Markdown
Member

I noticed one oddity when testing. If you click on another window the sideways scrollbar disappears.

Urgh, this was due a race condition inherent to the widget definitions being shared globally. I've added a hack to counter this.

@karst If you're happy with the PR in its current state, I think it's ready to be merged. Just needs a changelog entry and we're good to go.

@karst karst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me!

@AaronVanGeffen AaronVanGeffen removed the discussion Some input from team members is wanted. label Jul 8, 2024
@AaronVanGeffen AaronVanGeffen merged commit 71cba8a into OpenRCT2:develop Jul 8, 2024
AaronVanGeffen added a commit that referenced this pull request Jul 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog This issue/PR deserves a changelog entry. squash merge A PR that should be squashed on merge. user interface Has to do with user interfaces.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants