Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions shell/platform/darwin/ios/framework/Source/FlutterView.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
opaque:(BOOL)opaque
enableWideGamut:(BOOL)isWideGamutEnabled NS_DESIGNATED_INITIALIZER;

- (UIScreen*)screen;

// Set by FlutterEngine or FlutterViewController to override software rendering.
@property(class, nonatomic) BOOL forceSoftwareRendering;
@end
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/darwin/ios/framework/Source/FlutterView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ - (void)layoutSubviews {
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
CAMetalLayer* layer = (CAMetalLayer*)self.layer;
#pragma clang diagnostic pop
CGFloat screenScale = [UIScreen mainScreen].scale;
CGFloat screenScale = self.screen.scale;
layer.allowsGroupOpacity = YES;
layer.contentsScale = screenScale;
layer.rasterizationScale = screenScale;
Expand Down
13 changes: 13 additions & 0 deletions shell/platform/darwin/ios/framework/Source/FlutterViewTest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,17 @@ - (void)testIgnoreWideColorWithoutImpeller {
XCTAssertEqual(layer.pixelFormat, MTLPixelFormatBGRA8Unorm);
}

- (void)testLayerScalesMatchScreenAfterLayoutSubviews {
FakeDelegate* delegate = [[[FakeDelegate alloc] init] autorelease];
FlutterView* view = [[FlutterView alloc] initWithDelegate:delegate opaque:NO enableWideGamut:NO];
view.layer.contentsScale = CGFloat(-99.0);
view.layer.rasterizationScale = CGFloat(-99.0);
UIScreen* screen = [view screen];
XCTAssertNotEqual(view.layer.contentsScale, screen.scale);
XCTAssertNotEqual(view.layer.rasterizationScale, screen.scale);
[view layoutSubviews];
XCTAssertEqual(view.layer.contentsScale, screen.scale);
XCTAssertEqual(view.layer.rasterizationScale, screen.scale);
}

@end