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

[ENCHANCEMENT] Additional Functionality for Playbars #4229

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from

Conversation

Trofem
Copy link

@Trofem Trofem commented Feb 26, 2025

Does this PR close any issues? If so, link them below.

Fixes #4141

Briefly describe the issue(s) fixed.

Enhancement:
This PR adds turning on/off logic for all playbars:

Difficulty (playbarDifficulty)

  • Ctrl + Click -> open/close Difficulty Window

BPM (playbarBPM)

  • Ctrl + Click -> open/close Metadata Window

Note Snap (playbarNoteSnap)

  • Ctrl + Click -> open/close Note Window

Song Remaining Time (playbarSongRemaining) (new toolbox function)

  • Click -> open/close Offsets Window

Also:

  • Since this is change connected with Chart Editor playbars tooltips, also required to accept assets repo PR in order to UI tooltip to look corretly
    ( #132 funkin.assets ).
  • This repo is made on basis Chart editor window toggle fix #4143 solution, that help with fixing its bug.

Include any relevant screenshots or videos.

2025-02-26.03-22-24.mp4

изображение

Description: This PR adds switch logic for all playbars:

Difficulty (playbarDifficulty) - Ctrl + Click -> open /close Difficulty Window

BPM (playbarBPM) - Ctrl + Click -> open /close Metadata Window

Note Snap (playbarNoteSnap) - Ctrl + Click -> open/close Note Window

Song Remaining Time (playbarSongRemaining) (new toolbox function) - Click -> Offsets Window

Also:
Fixes FunkinCrew#4141
This repo will conflict with FunkinCrew#4143 since that PR fixes same bug.
@github-actions github-actions bot added pr: haxe PR modifies game code. status: pending triage Awaiting review. labels Feb 26, 2025
@github-actions github-actions bot added the size: medium A medium pull request with 100 or fewer changes. label Feb 26, 2025
@Hundrec Hundrec added the type: enhancement Involves an enhancement or new feature. label Feb 26, 2025
@AbnormalPoof AbnormalPoof added the topic: chart editor Related to the operation of the Chart Editor. label Feb 26, 2025
@Lasercar
Copy link
Contributor

Hey, allow me to welcome you for making your first PR!

Though usually, when you have an issue with an existing PR, you simply request changes on it, rather than making your own that makes the change, plus doing more.

I'd make this PR only do the additional changes you've made, and make a PR on my branch for your changes, to mine or suggest changes to it.

@amyspark-ng
Copy link
Contributor

image
i'd make the remaining time thing to have the same glow these do

@Trofem
Copy link
Author

Trofem commented Feb 26, 2025

@Lasercar Oh ok, i could make it as addition to yours

@Trofem
Copy link
Author

Trofem commented Feb 26, 2025

I guess I need to finish this branch and try to PR to yours?

@Lasercar
Copy link
Contributor

Lasercar commented Feb 26, 2025

Yeah, but keep your additional changes - adding the same functionality to note snap and song remaining time, separate, as I had no part in doing that, ofc.

@Lasercar
Copy link
Contributor

Lasercar commented Feb 26, 2025

Actually, no, I'll take the loss on this one, there's no way to separate the changes cleanly.

Don't worry about doing that now, I've closed my PR. You can edit the descriptions of your PRs to remove the part about the conflict with mine.

@Trofem
Copy link
Author

Trofem commented Feb 26, 2025

@Lasercar Oh damn, I guess it will be easier, But I actually used your solution with toolbar.selected, so you are made the contribution with it (Without it I wouldn't have a single idea). I just will change to "made on the basis of" your PR. Ok?

@Lasercar
Copy link
Contributor

Lasercar commented Feb 26, 2025

Sure! I'm a little surprised that you learned off my code and figured out a better implementation. That's never happened to me before!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: haxe PR modifies game code. size: medium A medium pull request with 100 or fewer changes. status: pending triage Awaiting review. topic: chart editor Related to the operation of the Chart Editor. type: enhancement Involves an enhancement or new feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants