Skip to content

Commit

Permalink
Merge branch 'main' into corebluetooth-xcode13-beta3
Browse files Browse the repository at this point in the history
  • Loading branch information
mandel-macaque authored Jul 20, 2021
2 parents 830b68d + eea8142 commit 82b793e
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 43 deletions.
36 changes: 30 additions & 6 deletions src/gamecontroller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1995,6 +1995,26 @@ enum GCInputDirectional {

[Field ("GCInputDirectionalCardinalDpad")]
CardinalDpad,

[TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15,0)]
[Field ("GCInputDirectionalCenterButton")]
CenterButton,

[TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15,0)]
[Field ("GCInputDirectionalTouchSurfaceButton")]
TouchSurfaceButton,
}

[TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15,0)]
enum GCInputMicroGamepad {
[Field ("GCInputMicroGamepadDpad")]
Dpad,

[Field ("GCInputMicroGamepadButtonA")]
ButtonA,

[Field ("GCInputMicroGamepadButtonX")]
ButtonX,
}

delegate GCVirtualControllerElementConfiguration GCVirtualControllerElementUpdateBlock (GCVirtualControllerElementConfiguration configuration);
Expand All @@ -2008,8 +2028,12 @@ interface GCVirtualController
[Export ("virtualControllerWithConfiguration:")]
GCVirtualController Create (GCVirtualControllerConfiguration configuration);

[Export ("initWithConfiguration:")]
[DesignatedInitializer]
IntPtr Constructor (GCVirtualControllerConfiguration configuration);

[Async]
[Export ("connectWithReply:")]
[Export ("connectWithReplyHandler:")]
void Connect ([NullAllowed] Action<NSError> reply);

[Export ("disconnect")]
Expand All @@ -2018,8 +2042,8 @@ interface GCVirtualController
[NullAllowed, Export ("controller", ArgumentSemantic.Weak)]
GCController Controller { get; }

[Export ("changeElement:configuration:")]
void Change (string element, GCVirtualControllerElementUpdateBlock configuration);
[Export ("updateConfigurationForElement:configuration:")]
void UpdateConfiguration (string element, GCVirtualControllerElementUpdateBlock configuration);
}

[NoTV, NoMac, NoWatch, iOS (15,0), MacCatalyst (15,0)]
Expand All @@ -2035,12 +2059,12 @@ interface GCVirtualControllerConfiguration
interface GCVirtualControllerElementConfiguration
{
[Export ("hidden")]
bool Hidden { get; set; }
bool Hidden { [Bind ("isHidden")] get; set; }

[NullAllowed, Export ("path", ArgumentSemantic.Strong)]
BezierPath Path { get; set; }

[Export ("touchpad")]
bool Touchpad { get; set; }
[Export ("actsAsTouchpad")]
bool ActsAsTouchpad { get; set; }
}
}
3 changes: 3 additions & 0 deletions src/imageio.cs
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,9 @@ interface CGImageProperties {
NSString PNGSoftware { get; }
[Field ("kCGImagePropertyPNGTitle")]
NSString PNGTitle { get; }
[Mac (12, 0), iOS (15, 0), TV (15,0), MacCatalyst (15,0), Watch (8,0)]
[Field ("kCGImagePropertyPNGPixelsAspectRatio")]
NSString PNGPixelsAspectRatio { get; }

[iOS (9,0)][Mac (10,11)]
[Field ("kCGImagePropertyPNGCompressionFilter")]
Expand Down
11 changes: 0 additions & 11 deletions tests/xtro-sharpie/MacCatalyst-GameController.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/MacCatalyst-ImageIO.todo

This file was deleted.

11 changes: 0 additions & 11 deletions tests/xtro-sharpie/iOS-GameController.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/iOS-ImageIO.todo

This file was deleted.

5 changes: 0 additions & 5 deletions tests/xtro-sharpie/macOS-GameController.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/macOS-ImageIO.todo

This file was deleted.

5 changes: 0 additions & 5 deletions tests/xtro-sharpie/tvOS-GameController.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/tvOS-ImageIO.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/watchOS-ImageIO.todo

This file was deleted.

0 comments on commit 82b793e

Please sign in to comment.