fix: Measurement logic for native elements #21957
Merged
+30
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
platform/macos 🍏
Copilot finished reviewing on behalf of
morning4coffe-dev
November 25, 2025 18:05
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes the measurement logic for native macOS elements in the Skia runtime. Previously, the code incorrectly retrieved dimensions from the first subview's frame, which didn't align with how other platforms handle native element measurement. The new implementation establishes a fallback hierarchy: it prioritizes availableWidth/availableHeight, then falls back to childWidth/childHeight, and finally to the element's bounds.size when other values are unavailable or invalid.
Key Changes:
- Replaced subview-based measurement with a parameter-based resolution strategy
- Added finite value checks using
isfinite()to handle infinite/NaN dimensions - Implemented fallback to element bounds when resolved dimensions are invalid
src/Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/UnoNativeMac/UNONative.m
Outdated
Show resolved
Hide resolved
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-21957/wasm-skia-net9/index.html |
Contributor
|
|
Contributor
|
The build 184972 found UI Test snapshots differences: Details
|
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-21957/wasm-skia-net9/index.html |
Contributor
|
🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-21957/docs/index.html |
Contributor
|
The build 185359 found UI Test snapshots differences: Details
|
spouliot
reviewed
Dec 2, 2025
src/Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/UnoNativeMac/UNONative.m
Outdated
Show resolved
Hide resolved
src/Uno.UI.Runtime.Skia.MacOS/UnoNativeMac/UnoNativeMac/UNONative.m
Outdated
Show resolved
Hide resolved
Contributor
|
🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-21957/docs/index.html |
spouliot
approved these changes
Dec 2, 2025
Contributor
|
🤖 Your WebAssembly Skia Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-21957/wasm-skia-net9/index.html |
Contributor
|
The build 185987 found UI Test snapshots differences: Details
|
MartinZikmund
approved these changes
Dec 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
GitHub Issue: closes #21810
PR Type:
What is the current behavior? 🤔
Screen.Recording.2025-11-23.at.17.01.35.mov
What is the new behavior? 🚀
PR Checklist ✅
Please check if your PR fulfills the following requirements:
Screenshots Compare Test Runresults.Other Info
https://github.com/user-attachments/files/23690767/UnoWeb.zip