Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLakshmi Shanmugam2017-11-14 08:24:53 -0500
committerLakshmi Shanmugam2017-11-14 15:44:08 -0500
commit9efbe4a8235bbb98fd1e36720eea53d0f012e240 (patch)
tree27be09718cec4dccd2f7fdf84a3c182aab3dbccd /bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse
parent4dee7f187eee7c8e55df2ad89a3d32263613e17c (diff)
downloadeclipse.platform.swt-9efbe4a8235bbb98fd1e36720eea53d0f012e240.tar.gz
eclipse.platform.swt-9efbe4a8235bbb98fd1e36720eea53d0f012e240.tar.xz
eclipse.platform.swt-9efbe4a8235bbb98fd1e36720eea53d0f012e240.zip
[Bug 525465] TextLayout with embedded images is missing text on macOS
High Sierra NSTextAttachmentCellProtocol has a new and required property "attachment" since 10.11. Added attachment method to SWTTextAttachmentCell for macOS version >= 10.11 Change-Id: I9b0686db3c90e6b7b8d5fd4db0a0c2b1c27d19ac
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java5
2 files changed, 9 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index 2b26cf05c2..41934477dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -5475,6 +5475,11 @@
<arg swt_gen="true"></arg>
</method>
</informal_protocol>
+ <informal_protocol name="NSTextAttachmentCell" swt_gen="mixed">
+ <method selector="attachment" swt_gen="true">
+ <retval swt_gen="true"></retval>
+ </method>
+ </informal_protocol>
<informal_protocol name="NSTextDelegate" swt_gen="mixed">
<method selector="textDidChange:" swt_gen="true">
<arg swt_gen="true"></arg>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index 59a5bf3c93..3f9d42de39 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -153,7 +153,8 @@ public class OS extends C {
public static final native long /*int*/ CALLBACK_cellBaselineOffset(long /*int*/ func);
/** @method callback_types=NSSize;id;SEL;,callback_flags=struct;none;none; */
public static final native long /*int*/ CALLBACK_NSTextAttachmentCell_cellSize(long /*int*/ func);
- public static final long /*int*/ protocol_NSTextAttachmentCell = objc_getProtocol("NSTextAttachmentCell");
+ /** @method callback_types=id;id;SEL;,callback_flags=struct;none;none; */
+ public static final native long /*int*/ CALLBACK_NSTextAttachmentCell_attachment(long /*int*/ func);
public static final long /*int*/ sel_cellBaselineOffset = sel_registerName("cellBaselineOffset");
/*10.6 Accessibility Strings*/
@@ -934,6 +935,7 @@ public static final long /*int*/ protocol_NSTabViewDelegate = objc_getProtocol("
public static final long /*int*/ protocol_NSTableDataSource = objc_getProtocol("NSTableDataSource");
public static final long /*int*/ protocol_NSTableViewDelegate = objc_getProtocol("NSTableViewDelegate");
public static final long /*int*/ protocol_NSTableViewNotifications = objc_getProtocol("NSTableViewNotifications");
+public static final long /*int*/ protocol_NSTextAttachmentCell = objc_getProtocol("NSTextAttachmentCell");
public static final long /*int*/ protocol_NSTextDelegate = objc_getProtocol("NSTextDelegate");
public static final long /*int*/ protocol_NSTextInput = objc_getProtocol("NSTextInput");
public static final long /*int*/ protocol_NSTextViewDelegate = objc_getProtocol("NSTextViewDelegate");
@@ -1048,6 +1050,7 @@ public static final long /*int*/ sel_arrayWithObject_ = sel_registerName("arrayW
public static final long /*int*/ sel_arrowCursor = sel_registerName("arrowCursor");
public static final long /*int*/ sel_ascender = sel_registerName("ascender");
public static final long /*int*/ sel_attachColorList_ = sel_registerName("attachColorList:");
+public static final long /*int*/ sel_attachment = sel_registerName("attachment");
public static final long /*int*/ sel_attribute_atIndex_effectiveRange_ = sel_registerName("attribute:atIndex:effectiveRange:");
public static final long /*int*/ sel_attributedStringValue = sel_registerName("attributedStringValue");
public static final long /*int*/ sel_attributedStringWithAttachment_ = sel_registerName("attributedStringWithAttachment:");

Back to the top