Skip to content

Sync branch 2.6 into main - #16798

Merged
acolombier merged 10 commits into
mixxxdj:mainfrom
ronso0:sync-branch-2.6-to-main
Jul 29, 2026
Merged

Sync branch 2.6 into main#16798
acolombier merged 10 commits into
mixxxdj:mainfrom
ronso0:sync-branch-2.6-to-main

Conversation

@ronso0

@ronso0 ronso0 commented Jul 29, 2026

Copy link
Copy Markdown
Member

There was a minor conflict in src/library/analysis/dlganalysis.h because of #16588

ronso0 and others added 10 commits May 23, 2026 07:31
also fix cover and star rating on show and late resize events
Due to both using BrowseTaleModel they shared the same namespace, which leads to identical
initial header states (same column layout and sorting)
Apply the same destruction override like in DlgAutoDJ, which also has its own
WTrackTableView, to ensure the table view is destroyed before the models (which
the tale view relies on to save its header state)
(fix) save header state of Recording feature
(fix) Preferences: avoid scroll stop over disabled checkboxes
(fix) Track Info: expand only Comment editor when expanding vertically
@acolombier

Copy link
Copy Markdown
Member

Quick heads up that you might want to push this branch to the organisation so the bot can continue updating this PR as new changes comes in 2.6 and doesn't further conflict :)
Note that the double run may occur, but there is a fix awaiting for review here

@acolombier
acolombier merged commit c5a3104 into mixxxdj:main Jul 29, 2026
17 checks passed
@ronso0

ronso0 commented Jul 30, 2026

Copy link
Copy Markdown
Member Author

you might want to push this branch to the organisation so the bot can ...

okay, will try. never did that before except for quickfix force-pushes.

@ronso0
ronso0 deleted the sync-branch-2.6-to-main branch July 30, 2026 21:40
@acolombier

Copy link
Copy Markdown
Member

You can see it an action here:
I have open a PR with a conflict resolution, and since then, the bot has kept pushing the later change, such that we will have everything in sync as soon as this gets merged, with a single PR :D

@ronso0

ronso0 commented Jul 30, 2026

Copy link
Copy Markdown
Member Author

Sounds fun : )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants