[Foundation] Merge multiple partial NSAttributedString definitions. (#16889)
It just ends up being confusing and difficult to get a full picture of the type's API definition if it's spread over multiple places. Ref: https://github.com/xamarin/xamarin-macios/issues/14489
This commit is contained in:
Родитель
5957b98085
Коммит
7af808fa46
|
@ -661,6 +661,65 @@ namespace Foundation
|
||||||
[Export ("attributedStringByInflectingString")]
|
[Export ("attributedStringByInflectingString")]
|
||||||
NSAttributedString AttributedStringByInflectingString { get; }
|
NSAttributedString AttributedStringByInflectingString { get; }
|
||||||
|
|
||||||
|
[NoiOS][NoMacCatalyst][NoWatch][NoTV]
|
||||||
|
[Export ("boundingRectWithSize:options:")]
|
||||||
|
CGRect BoundingRectWithSize (CGSize size, NSStringDrawingOptions options);
|
||||||
|
|
||||||
|
#if MONOMAC
|
||||||
|
[Field ("NSTextLayoutSectionOrientation", "AppKit")]
|
||||||
|
#else
|
||||||
|
[Field ("NSTextLayoutSectionOrientation", "UIKit")]
|
||||||
|
#endif
|
||||||
|
[iOS (7,0)]
|
||||||
|
NSString TextLayoutSectionOrientation { get; }
|
||||||
|
|
||||||
|
#if MONOMAC
|
||||||
|
[Field ("NSTextLayoutSectionRange", "AppKit")]
|
||||||
|
#else
|
||||||
|
[Field ("NSTextLayoutSectionRange", "UIKit")]
|
||||||
|
#endif
|
||||||
|
[iOS (7,0)]
|
||||||
|
NSString TextLayoutSectionRange { get; }
|
||||||
|
|
||||||
|
#if MONOMAC
|
||||||
|
[Field ("NSTextLayoutSectionsAttribute", "AppKit")]
|
||||||
|
#else
|
||||||
|
[Field ("NSTextLayoutSectionsAttribute", "UIKit")]
|
||||||
|
#endif
|
||||||
|
[iOS (7,0)]
|
||||||
|
NSString TextLayoutSectionsAttribute { get; }
|
||||||
|
|
||||||
|
[NoiOS, NoWatch, NoTV]
|
||||||
|
[Deprecated (PlatformName.MacOSX, 10, 11)]
|
||||||
|
[Field ("NSUnderlineByWordMask", "AppKit")]
|
||||||
|
nint UnderlineByWordMaskAttributeName { get; }
|
||||||
|
|
||||||
|
#if MONOMAC
|
||||||
|
[Field ("NSTextScalingDocumentAttribute", "AppKit")]
|
||||||
|
#else
|
||||||
|
[Field ("NSTextScalingDocumentAttribute", "UIKit")]
|
||||||
|
#endif
|
||||||
|
[Mac (10,15)]
|
||||||
|
[iOS (13,0), TV (13,0), Watch (6,0)]
|
||||||
|
NSString TextScalingDocumentAttribute { get; }
|
||||||
|
|
||||||
|
#if MONOMAC
|
||||||
|
[Field ("NSSourceTextScalingDocumentAttribute", "AppKit")]
|
||||||
|
#else
|
||||||
|
[Field ("NSSourceTextScalingDocumentAttribute", "UIKit")]
|
||||||
|
#endif
|
||||||
|
[Mac (10,15)]
|
||||||
|
[iOS (13,0), TV (13,0), Watch (6,0)]
|
||||||
|
NSString SourceTextScalingDocumentAttribute { get; }
|
||||||
|
|
||||||
|
#if MONOMAC
|
||||||
|
[Field ("NSCocoaVersionDocumentAttribute", "AppKit")]
|
||||||
|
#else
|
||||||
|
[Field ("NSCocoaVersionDocumentAttribute", "UIKit")]
|
||||||
|
#endif
|
||||||
|
[Mac (10,15)]
|
||||||
|
[iOS (13,0), TV (13,0), Watch (6,0)]
|
||||||
|
NSString CocoaVersionDocumentAttribute { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
// we follow the API found in swift
|
// we follow the API found in swift
|
||||||
|
@ -13976,65 +14035,6 @@ namespace Foundation
|
||||||
NSImage ImageForResource (string name);
|
NSImage ImageForResource (string name);
|
||||||
}
|
}
|
||||||
|
|
||||||
partial interface NSAttributedString {
|
|
||||||
|
|
||||||
#if MONOMAC
|
|
||||||
[Field ("NSTextLayoutSectionOrientation", "AppKit")]
|
|
||||||
#else
|
|
||||||
[Field ("NSTextLayoutSectionOrientation", "UIKit")]
|
|
||||||
#endif
|
|
||||||
[iOS (7,0)]
|
|
||||||
NSString TextLayoutSectionOrientation { get; }
|
|
||||||
|
|
||||||
#if MONOMAC
|
|
||||||
[Field ("NSTextLayoutSectionRange", "AppKit")]
|
|
||||||
#else
|
|
||||||
[Field ("NSTextLayoutSectionRange", "UIKit")]
|
|
||||||
#endif
|
|
||||||
[iOS (7,0)]
|
|
||||||
NSString TextLayoutSectionRange { get; }
|
|
||||||
|
|
||||||
#if MONOMAC
|
|
||||||
[Field ("NSTextLayoutSectionsAttribute", "AppKit")]
|
|
||||||
#else
|
|
||||||
[Field ("NSTextLayoutSectionsAttribute", "UIKit")]
|
|
||||||
#endif
|
|
||||||
[iOS (7,0)]
|
|
||||||
NSString TextLayoutSectionsAttribute { get; }
|
|
||||||
|
|
||||||
[NoiOS, NoWatch, NoTV]
|
|
||||||
[Deprecated (PlatformName.MacOSX, 10, 11)]
|
|
||||||
[Field ("NSUnderlineByWordMask", "AppKit")]
|
|
||||||
nint UnderlineByWordMaskAttributeName { get; }
|
|
||||||
|
|
||||||
#if MONOMAC
|
|
||||||
[Field ("NSTextScalingDocumentAttribute", "AppKit")]
|
|
||||||
#else
|
|
||||||
[Field ("NSTextScalingDocumentAttribute", "UIKit")]
|
|
||||||
#endif
|
|
||||||
[Mac (10,15)]
|
|
||||||
[iOS (13,0), TV (13,0), Watch (6,0)]
|
|
||||||
NSString TextScalingDocumentAttribute { get; }
|
|
||||||
|
|
||||||
#if MONOMAC
|
|
||||||
[Field ("NSSourceTextScalingDocumentAttribute", "AppKit")]
|
|
||||||
#else
|
|
||||||
[Field ("NSSourceTextScalingDocumentAttribute", "UIKit")]
|
|
||||||
#endif
|
|
||||||
[Mac (10,15)]
|
|
||||||
[iOS (13,0), TV (13,0), Watch (6,0)]
|
|
||||||
NSString SourceTextScalingDocumentAttribute { get; }
|
|
||||||
|
|
||||||
#if MONOMAC
|
|
||||||
[Field ("NSCocoaVersionDocumentAttribute", "AppKit")]
|
|
||||||
#else
|
|
||||||
[Field ("NSCocoaVersionDocumentAttribute", "UIKit")]
|
|
||||||
#endif
|
|
||||||
[Mac (10,15)]
|
|
||||||
[iOS (13,0), TV (13,0), Watch (6,0)]
|
|
||||||
NSString CocoaVersionDocumentAttribute { get; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[Watch (3,0)][TV (10,0)][Mac (10,12)][iOS (10,0)]
|
[Watch (3,0)][TV (10,0)][Mac (10,12)][iOS (10,0)]
|
||||||
[BaseType (typeof (NSObject))]
|
[BaseType (typeof (NSObject))]
|
||||||
interface NSDateInterval : NSCopying, NSSecureCoding {
|
interface NSDateInterval : NSCopying, NSSecureCoding {
|
||||||
|
@ -14193,13 +14193,6 @@ namespace Foundation
|
||||||
NSUrl PrimaryPresentedItemUrl { get; }
|
NSUrl PrimaryPresentedItemUrl { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[NoiOS][NoMacCatalyst][NoWatch][NoTV]
|
|
||||||
partial interface NSAttributedString {
|
|
||||||
[NoiOS][NoMacCatalyst][NoWatch][NoTV]
|
|
||||||
[Export ("boundingRectWithSize:options:")]
|
|
||||||
CGRect BoundingRectWithSize (CGSize size, NSStringDrawingOptions options);
|
|
||||||
}
|
|
||||||
|
|
||||||
[NoiOS][NoMacCatalyst][NoWatch][NoTV]
|
[NoiOS][NoMacCatalyst][NoWatch][NoTV]
|
||||||
[Deprecated (PlatformName.MacOSX, 12, 0, message : "Use the Network.framework instead.")]
|
[Deprecated (PlatformName.MacOSX, 12, 0, message : "Use the Network.framework instead.")]
|
||||||
[BaseType (typeof (NSObject))]
|
[BaseType (typeof (NSObject))]
|
||||||
|
|
Загрузка…
Ссылка в новой задаче