(rejected)[ENCHANCEMENT] Additional Functionality for Playbars

[Trofem]

INGNORE ALL THIS, moved to #4861

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) (hovering color added)

• 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 correctly
  ( #132 funkin.assets ).
• This repo is made on basis [DUPLICATE] [BUGFIX] Chart Editor - Window toggle fix #4143 solution, that help with fixing its bug.

Include any relevant screenshots or videos.

23_-_03_2025_18-53-55.mp4

[Lasercar]

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]

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

[Trofem]

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

[Trofem]

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

[Lasercar]

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]

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]

@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]

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!

[Trofem]

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

done
PS 3/23
Also updated video to show assets changes

[Hundrec]

Oops! Be sure to rebase your PR on the develop branch!

[Trofem]

oh yea i sure did a mess.

[Lasercar]

Ahhhh, when you're getting the new changes, always add --rebase to the pull/fetch, that way it doesn't create a merge commit.

I'd probably reset it to 1dca768 and then pull --rebase the develop branch, that should hopefully fix all this.

[Lasercar]

You can still fix this, you just have to cherry pick your commits back.

be92f9d
1dca768

git cherry-pick <commit-hash>

so, that'd be

git cherry-pick be92f9d797a18c1978746b1276a65d557fca8e80
and
git cherry-pick 1dca768402a9020d73dec7d9b0ec6272a6d276d0

Might have to fetch them from your fork first though?

For example: git fetch https://github.com/Trofem/Funkin.git be92f9d797a18c1978746b1276a65d557fca8e80

[Trofem]

on repo it is fixed but pr is broken. i will later create another pr with same content later once i will get how to manage them more correctly.

[Trofem]

also thanks Lasercar. damn, i would be in loss without your help

[Lasercar]

Oh, I had a look at it, uh

There's a double up of the commits

Also, whenever you update your develop and/or main branch on your fork to match the upstream, you still have to do it for your local (aka computer) branch, idk if you already know that or not.

git reset --hard 6b9f8d0 should fix that double up

That'll hard reset it to Trofem@6b9f8d0

Hmm, but that merge commit that'd still be included in changes though, so maybe reset back to Trofem@edb270d instead?

And then git pull https://github.com/FunkinCrew/Funkin.git develop --rebase on your playbar branch?

When you get conflicts and have to merge it, you basically want to accept the changes that aren't overriding your stuff, and then accept your changes so that they don't disappear.

If you get both in the same position, then you'll have to fix the conflict manually.

rebasing is basically like a regular merge but it removes commits that don't exactly change anything (depending on how you fix the conflicts, that is), and doesn't create a merge commit.

[github-actions]

This pull request is a duplicate. Please direct all discussion to the original pull request.