Skip to content

[iOS/MacCatalyst] Fix Editor scrolling #13234

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
rmarinho merged 2 commits into from
Feb 16, 2023
Merged

[iOS/MacCatalyst] Fix Editor scrolling #13234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57bfc88
[iOS] Don't update the offset if there's no space available
rmarinho Feb 9, 2023
6a93f5c
[iOS] Use the MauiLabel to set a label with insets
rmarinho Feb 9, 2023
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
25 changes: 6 additions & 19 deletions src/Core/src/Platform/iOS/MauiTextView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public override void LayoutSubviews()

UILabel InitPlaceholderLabel()
{
var placeholderLabel = new UILabel
var placeholderLabel = new MauiLabel
{
BackgroundColor = UIColor.Clear,
TextColor = ColorExtensions.PlaceholderColor,
Expand All @@ -129,23 +129,8 @@ UILabel InitPlaceholderLabel()
var edgeInsets = TextContainerInset;
var lineFragmentPadding = TextContainer.LineFragmentPadding;

var vConstraints = NSLayoutConstraint.FromVisualFormat(
"V:|-" + edgeInsets.Top + "-[PlaceholderLabel]-" + edgeInsets.Bottom + "-|", 0, new NSDictionary(),
NSDictionary.FromObjectsAndKeys(
new NSObject[] { placeholderLabel }, new NSObject[] { new NSString("PlaceholderLabel") })
);

var hConstraints = NSLayoutConstraint.FromVisualFormat(
"H:|-" + lineFragmentPadding + "-[PlaceholderLabel]-" + lineFragmentPadding + "-|",
0, new NSDictionary(),
NSDictionary.FromObjectsAndKeys(
new NSObject[] { placeholderLabel }, new NSObject[] { new NSString("PlaceholderLabel") })
);

placeholderLabel.TranslatesAutoresizingMaskIntoConstraints = false;

AddConstraints(hConstraints);
AddConstraints(vConstraints);
placeholderLabel.TextInsets = new UIEdgeInsets(edgeInsets.Top, edgeInsets.Left + lineFragmentPadding,
edgeInsets.Bottom, edgeInsets.Right + lineFragmentPadding);

return placeholderLabel;
}
Expand All @@ -165,7 +150,9 @@ void ShouldCenterVertically()
{
var fittingSize = new CGSize(Bounds.Width, NFloat.MaxValue);
var sizeThatFits = SizeThatFits(fittingSize);
var availableSpace = (Bounds.Height - sizeThatFits.Height * ZoomScale);
var availableSpace = Bounds.Height - sizeThatFits.Height * ZoomScale;
if (availableSpace <= 0)
return;
ContentOffset = VerticalTextAlignment switch
{
Maui.TextAlignment.Center => new CGPoint(0, -Math.Max(1, availableSpace / 2)),
Expand Down