Merge remote-tracking branch 'TJ/Nullable-GameplayKit' into Nullable-…

…GameplayKit
dotnet · Apr 11, 2022 · 249735d · 249735d
2 parents f0eb810 + 69eeeee
commit 249735d
Show file tree

Hide file tree

Showing 9 changed files with 119 additions and 100 deletions.
diff --git a/dotnet/Templates/Microsoft.macOS.Templates/macos/Main.storyboard b/dotnet/Templates/Microsoft.macOS.Templates/macos/Main.storyboard
@@ -683,7 +683,7 @@
         <scene sceneID="R2V-B0-nI4">
             <objects>
                 <windowController id="B8D-0N-5wS" sceneMemberID="viewController">
-                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
+                    <window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="YES" animationBehavior="default" id="IQv-IB-iLA">
                         <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
                         <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
                         <rect key="contentRect" x="196" y="240" width="480" height="270"/>

diff --git a/src/appkit.cs b/src/appkit.cs
@@ -11120,13 +11120,12 @@ interface NSLevelIndicatorCell {
 		void SetImage (NSImage image);
 	}
 
-#if MONOMAC
+	[NoMacCatalyst]
 	[Protocol (IsInformal = true)]
 	interface NSLayerDelegateContentsScaleUpdating {
 		[Export ("layer:shouldInheritContentsScale:fromWindow:")]
 		bool ShouldInheritContentsScale (CALayer layer, nfloat newScale, NSWindow fromWindow);
 	}
-#endif
 
 	[Mac (10,11)]
 	[NoMacCatalyst]