Skip to content

[Fabric] Shim RCTPixelValue to take scale factor #1586

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Dec 22, 2022
+15 −0
Merged

[Fabric] Shim RCTPixelValue to take scale factor #1586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
53587dc
Fix RCTUISwitch definition removed in #1576
Dec 12, 2022
3a68dac
Shim RCTPixelValue to take scale factor
Dec 12, 2022
077c4eb
Remove extra semicolon
Dec 13, 2022
da15842
Merge remote-tracking branch 'microsoft/main' into fabric/shim-rctpix…
Dec 13, 2022
26ef9aa
Merge remote-tracking branch 'microsoft/main' into fabric/shim-rctpix…
Dec 15, 2022
427231f
Merge remote-tracking branch 'microsoft/main' into fabric/shim-rctpix…
Dec 16, 2022
1c9b861
Merge remote-tracking branch 'microsoft/main' into fabric/shim-rctpix…
Dec 22, 2022
13bc55f
Fix macOS tags
Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ - (UIEdgeInsets)_safeAreaInsets
return UIEdgeInsetsZero;
}

#if !TARGET_OS_OSX // TODO(macOS GH#774)
- (void)safeAreaInsetsDidChange
{
[super safeAreaInsetsDidChange];

[self _updateStateIfNecessary];
}
#endif // TODO(macOS GH#774)

- (void)_updateStateIfNecessary
{
Expand All @@ -52,10 +54,18 @@ - (void)_updateStateIfNecessary
}

UIEdgeInsets insets = [self _safeAreaInsets];
#if !TARGET_OS_OSX // TODO(macOS GH#774)
insets.left = RCTRoundPixelValue(insets.left);
insets.top = RCTRoundPixelValue(insets.top);
insets.right = RCTRoundPixelValue(insets.right);
insets.bottom = RCTRoundPixelValue(insets.bottom);
#else // [TODO(macOS GH#774)
CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];;
insets.left = RCTRoundPixelValue(insets.left, scale);
insets.top = RCTRoundPixelValue(insets.top, scale);
insets.right = RCTRoundPixelValue(insets.right, scale);
insets.bottom = RCTRoundPixelValue(insets.bottom, scale);
#endif // ]TODO(macOS GH#774)

auto newPadding = RCTEdgeInsetsFromUIEdgeInsets(insets);
auto threshold = 1.0 / RCTScreenScale() + 0.01; // Size of a pixel plus some small threshold.
Expand Down
5 changes: 5 additions & 0 deletions ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ - (TextMeasurement)measureNSAttributedString:(NSAttributedString *)attributedStr

CGSize size = [layoutManager usedRectForTextContainer:textContainer].size;

#if !TARGET_OS_OSX // TODO(macOS GH#774)
size = (CGSize){RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height)};
#else // [TODO(macOS GH#774)
CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
size = (CGSize){RCTCeilPixelValue(size.width, scale), RCTCeilPixelValue(size.height, scale)};
#endif // ]TODO(macOS GH#774)

__block auto attachments = TextMeasurement::Attachments{};

Expand Down