Skip to content

Commit

Permalink
[create-pull-request] automated change
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jul 28, 2023
1 parent b2b791c commit a2aacb2
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ protected override void Init()
scrollView.Content = layout;
Content = scrollView;

resizeButton.Clicked += (sender, args) => {
resizeButton.Clicked += (sender, args) =>
{
// Resize the ScrollView content so the test button will be off the screen
// If the bug is present, this will make the button untappable
layoutContent.HeightRequest = 1000;
layoutContent.HeightRequest = 1000;
};

// Show the Success label if the button is tapped, so we can verify the bug is not present
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Handlers/ScrollView/ScrollViewHandler.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ Size ICrossPlatformLayout.CrossPlatformArrange(Rect bounds)
{
var scrollView = VirtualView;
var platformScrollView = PlatformView;

var contentSize = scrollView.CrossPlatformArrange(bounds);

// The UIScrollView's bounds are available, so we can use them to make sure the ContentSize makes sense
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/MauiRefreshView.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Diagnostics.CodeAnalysis;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Text;
using CoreGraphics;
using Microsoft.Maui.Graphics;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void SwipeViewLoaded(object s, RoutedEventArgs e)
}
else
#endif
viewHandler.PlatformArrange(view.Frame);
viewHandler.PlatformArrange(view.Frame);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/TestUtils/src/TestUtils.Appium.UITests/AppiumUITestApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -933,14 +933,14 @@ void ScrollTo(AppiumQuery toQuery, AppiumQuery? withinQuery = null, TimeSpan? ti

// First we need to determine the area within which we'll make our scroll gestures
Size? scrollAreaSize = null;

if (withinQuery != null)
{
var within = FindFirstElement(withinQuery);
scrollAreaSize = within?.Size;
}

if(scrollAreaSize is null)
if (scrollAreaSize is null)
{
var window = _driver?.Manage().Window ?? throw new InvalidOperationException("Element to scroll within not specified, and no Window available. Cannot scroll.");
scrollAreaSize = window.Size;
Expand Down

0 comments on commit a2aacb2

Please sign in to comment.