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
Fix RTL in AbsoluteLayout #7309
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
e0b0008
Add AbsoluteLayoutManager RTL tests
rachelkang 5cf34ac
First attempt at fix
rachelkang 4290ea8
Merge branch 'main' into fix-6540
rachelkang c11ba3a
Fix up tests and RTL math
rachelkang 83a6c3f
Remove unnecessary using
rachelkang 71d10e0
Remove unneeded and wrong code
rachelkang f7b327b
Update based on feedback
rachelkang 7619859
Remove unused variable
rachelkang File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -445,5 +445,47 @@ public void ChildMeasureRespectsProportionalBounds() | |||||
|
||||||
child.Received().Measure(Arg.Is(expectedWidth * widthConstraint), Arg.Is(expectedHeight * heightConstraint)); | ||||||
} | ||||||
|
||||||
[Fact(DisplayName = "First View in LTR Absolute Layout is on the left")] | ||||||
public void LtrShouldHaveFirstItemOnTheLeft() | ||||||
{ | ||||||
var abs = CreateTestLayout(); | ||||||
var child = CreateTestView(); | ||||||
SubstituteChildren(abs, child); | ||||||
var childBounds = new Rect(10, 0, 100, 100); | ||||||
SetLayoutBounds(abs, child, childBounds); | ||||||
|
||||||
abs.FlowDirection.Returns(FlowDirection.LeftToRight); | ||||||
|
||||||
var manager = new AbsoluteLayoutManager(abs); | ||||||
var measuredSize = manager.Measure(double.PositiveInfinity, 100); | ||||||
manager.ArrangeChildren(new Rect(Point.Zero, measuredSize)); | ||||||
|
||||||
// We expect that the view should be arranged on the left | ||||||
var expectedRectangle = new Rect(10, 0, 100, 100); | ||||||
|
||||||
abs[0].Received().Arrange(Arg.Is(expectedRectangle)); | ||||||
} | ||||||
|
||||||
[Fact(DisplayName = "First View in RTL Absolute Layout is on the right")] | ||||||
public void RtlShouldHaveFirstItemOnTheRight() | ||||||
{ | ||||||
var abs = CreateTestLayout(); | ||||||
var child = CreateTestView(); | ||||||
SubstituteChildren(abs, child); | ||||||
var childBounds = new Rect(10, 0, 100, 100); | ||||||
SetLayoutBounds(abs, child, childBounds); | ||||||
|
||||||
abs.FlowDirection.Returns(FlowDirection.RightToLeft); | ||||||
|
||||||
var manager = new AbsoluteLayoutManager(abs); | ||||||
var measuredSize = manager.Measure(double.PositiveInfinity, 100); | ||||||
manager.ArrangeChildren(new Rect(Point.Zero, measuredSize)); | ||||||
|
||||||
// We expect that the view hould be arranged on the right | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. fixed, thank you! 😂 |
||||||
var expectedRectangle = new Rect(0, 0, 100, 100); | ||||||
|
||||||
abs[0].Received().Arrange(Arg.Is(expectedRectangle)); | ||||||
} | ||||||
} | ||||||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it make sense to reuse
left
andright
here, since they seem to match?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
definitely, thanks for catching that!