Skip to content

[Housekeeping] Revert changes from 11721 #13253

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 10, 2023
Merged

[Housekeeping] Revert changes from 11721 #13253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ace7c33
Revert changes from 11721
jsuarezruiz Feb 10, 2023
762ba99
Revert device tests
jsuarezruiz Feb 10, 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
11 changes: 2 additions & 9 deletions src/Core/src/Platform/iOS/ViewExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,23 +268,16 @@ public static void UpdateBackgroundLayerFrame(this UIView view)

var layer = view.Layer;

UpdateBackgroundLayerFrame(layer, view.Bounds);
}

static void UpdateBackgroundLayerFrame(CALayer layer, CGRect bounds)
{
if (layer == null || layer.Sublayers == null || layer.Sublayers.Length == 0)
return;

foreach (var sublayer in layer.Sublayers)
{
if (sublayer.Name == BackgroundLayerName && sublayer.Frame != bounds)
if (sublayer.Name == BackgroundLayerName && sublayer.Frame != view.Bounds)
{
sublayer.Frame = bounds;
sublayer.Frame = view.Bounds;
break;
}

UpdateBackgroundLayerFrame(sublayer, bounds);
}
}

Expand Down
33 changes: 1 addition & 32 deletions src/Core/tests/DeviceTests/Handlers/ContentView/ContentViewTests.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Microsoft.Maui.DeviceTests.Stubs;
using UIKit;
using Xunit;
Expand All @@ -9,23 +8,6 @@ namespace Microsoft.Maui.DeviceTests.Handlers.ContentView
[Category(TestCategory.ContentView)]
public partial class ContentViewTests
{
[Theory(DisplayName = "Background Updates Correctly")]
[InlineData(0xFF0000)]
[InlineData(0x00FF00)]
[InlineData(0x0000FF)]
public async Task BackgroundUpdatesCorrectly(uint color)
{
var expected = Color.FromUint(color);

var contentView = new ContentViewStub()
{
Content = new LabelStub { Text = "Background", TextColor = Colors.White },
Background = new LinearGradientPaintStub(Colors.Red, Colors.Blue),
};

await ValidateHasColor(contentView, expected);
}

[Fact, Category(TestCategory.FlowDirection)]
public async Task FlowDirectionPropagatesToContent()
{
Expand Down Expand Up @@ -123,18 +105,5 @@ public async Task DoesNotPropagateToContentWithExplicitFlowDirection()

Assert.Equal(UIUserInterfaceLayoutDirection.LeftToRight, labelFlowDirection);
}

Platform.ContentView GetNativeContentView(ContentViewHandler contentViewHandler) =>
contentViewHandler.PlatformView;

Task ValidateHasColor(IContentView contentView, Color color, Action action = null)
{
return InvokeOnMainThreadAsync(() =>
{
var nativeContentView = GetNativeContentView(CreateHandler(contentView));
action?.Invoke();
nativeContentView.AssertContainsColor(color);
});
}
}
}