Sort by play count #1080
Sort by play count #1080
Conversation
Decimate1405
commented
Mar 4, 2025
•
Decimate1405
commented
- Feature request
marquee effect on song title
Merge pull request #1 from Decimate1405/marquee
fixed non marquee text alignment issue
…that's a temp fix for marquee after flutter 3.2.2
…r based on toggle switch and title size
…ine marquee duplicates for short titles
…or on the now playing bar adapts to the theme. Fixed bug where with the one line marquee enabled, even non-overflowing text uses a marquee on the player screen.
…ttings and renamed it "Allow one line break before using scrolling text"
…es instead of using marquee
…y trigger for 3 or more
…eshold switches to marquee
…d toggle title and description
|
@Decimate1405 thanks for the PR! But something got messed up, the diff is massive, with tons of JSON files, and there are commits from your last PR in there. |
Decimate1405
force-pushed
the
sort_by_play_count
branch
from
f6e9325 to
b030f33
Compare
|
i apologize all this mess, git is sometimes confusing for me. I added the changes to the redesign branch but when I try to create a new PR with that branch I still see these old changes instead of just the new one. Trying to figure this out now |
|
This is what I see on my current redesign branch
|
|
This is most likely because I squashed all the commits from your last PR into a new commit that contained everything. That helps to keep the commit history clean and uncluttered. But now Git still doesn't see your original commits in the upstream branch, so it tries to merge them in once again, which causes the conflict. To fix this, you should reset the branch on your fork to the base branch, by checking it out ( |
|
Thank you very much for explaining! Will work on this |
