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

[Windowing] Fix regression for resolution label #23371

Merged
merged 2 commits into from Jun 11, 2023

Conversation

enen92
Copy link
Member

@enen92 enen92 commented Jun 8, 2023

Description

This fixes a regression caused by #23259 on platforms such as Linux and Android. We were using the resolution id as the label but it turns out on those platforms the id is already being used for other purposes, see #23259 (comment)

Hence in this PR we introduce a label property we are free to set from the windowing system for UI display purposes (e.g. when we select the resolution in the display settings) that takes precedence over the label that is created with the resolution internal properties (width, height, etc). We still match setting selection by ID but decouple the label from the id.

Motivation and context

Regression fix, restore same functionality as before.

How has this been tested?

Runtime tested in MacOS (source of the feature) and tested by @joseluismarti on other platforms

What is the effect on users?

Restore previous functionality

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)
  • 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

@enen92 enen92 added Type: Fix non-breaking change which fixes an issue Component: Windowing v21 Omega labels Jun 8, 2023
@enen92 enen92 added this to the Omega 21.0 Alpha 2 milestone Jun 8, 2023
@enen92
Copy link
Member Author

enen92 commented Jun 8, 2023

@joseluismarti can't add u as a reviewer since you are not a team member but some review/feedback is appreciated

@joseluismarti
Copy link
Contributor

Of course, I've tested on Android and it correctly displays the supported resolutions:

screen

@enen92
Copy link
Member Author

enen92 commented Jun 9, 2023

Jenkins build this please

@fuzzard fuzzard merged commit 5bf464c into xbmc:master Jun 11, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Windowing Type: Fix non-breaking change which fixes an issue v21 Omega
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants