[Estuary] Fix home categories focus position

[Hitcher]

Description

This fixes the problem where the 'Now playing' (for Movies) and 'Next Aired' (for TV Shows) would get focus even though they're at the end of the categories list.

Motivation and context

It seems that in a mixed content type list the static content gets focus ahead of the dynamic content. By simply placing the static items at the front of the categories list means the focus always goes to the front of the list.
Problem reported on the forum - Category Icons at top is right aligned for some reason
Fixes this issue - #20139

How has this been tested?

Tested and works as expected.

What is the effect on users?

Screenshots (if appropriate):

Before PR:
The categories list is offset on load

And the first item doesn't get selected

After PR:
The categories list is correctly aligned

And the first item gets selected

Types of change

• Bug fix (non-breaking change which fixes an issue)
• Clean up (non-breaking change which removes non-working, unmaintained functionality)
• Improvement (non-breaking change which improves existing functionality)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that will cause existing functionality to change)
• Cosmetic change (non-breaking change that doesn't touch code)
• Student submission (PR was done for educational purposes and will be treated as such)
• None of the above (please explain below)

Checklist:

• My code follows the Code Guidelines of this project
• My change requires a change to the documentation, either Doxygen or wiki
• I have updated the documentation accordingly
• I have read the Contributing document
• I have added tests to cover my change
• All new and existing tests passed

[ksooo]

@HitcherUK you selected me for review, but honestly, I have no idea what consequences the change you made could have. My skinning skills are quite basic, I'd say.

[garbear]

I guess I can approve, I tested this and confirmed that it fixed the problem.

[Hitcher]

Sorry ksooo and thanks garbear.

[rainman74]

Could this also be made available for Nexus, please?

[garbear]

I support a backport. There's a small conflict introduced by #23814 but it's not too hard to resolve.

@HitcherUK Can you backport? I can help take care of the rebase conflict if you have any problems.

[Hitcher]

There's a small conflict introduced by #23814 but it's not too hard to resolve.

With this PR?

Can you backport?

Not sure how to; any pointers?

[garbear]

Not sure how to; any pointers?

Sure, to avoid the conflict without any complicated git resolving magic you can do a poor man's backport - create a branch based on Nexus, make the same change by hand, then send a PR.

Create a new branch based on the current tip of the Nexus branch (make sure to fetch from upstream first):

git checkout -b backport-fix-categories 618d1e35d89f1c49c2a37f5d233319f3f3bbe01b

You'll then have a branch named backport-fix-categories based on upstream Nexus.

Then, make the same change by hand and commit it.

Then push the branch to your repo

git push --set-upstream origin backport-fix-categories

Then you can PR the backport-fix-categories branch. Make sure to target the upstream Nexus branch when creating the PR. You'll see a big mess, but when you target Nexus then you'll see a clean PR with just your commit and the PR title neatly filled out.

[garbear]

Close enough 😉 You missed the "target Nexus" part so I edited the PR. You can see how now it's clean against Nexus. Thanks!

[Hitcher]

@garbear sorry, I don't do command line.

Had a go but I think there's wrong as it says Files changed 599 - #24027

[garbear]

Check now all fixed!

[Hitcher]

That was quick, thanks.

[garbear]

You rocked the git part! But I'm not surprised the confusing GitHub interface tripped up the backport, it's bitten me before too.

[KarellenX]

Nice. I was wondering why it displayed this way. I made the change to my local install, and all working correctly again.

[rainman74]

@HitcherUK
Something seems to have gone wrong, I can't find the PR in the xbmc:Nexus branch.

[Hitcher]

Something seems to have gone wrong, I can't find the PR in the xbmc:Nexus branch.

@garbear any ideas?

[jjd-uk]

Well that's expected as PR24027 is still closed, it needs reopening, then approval, and merging.

[Hitcher]

Could have sworn it was merged. I'll try and sort it over the weekend.