Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2011-08-23 15:27:55 -0400
committerSilenio Quarti2011-08-23 15:36:09 -0400
commit5da39923b173492efdb30bf0fb32d1cacd121e69 (patch)
tree71c776469cd46ad4501ebbedccc39fdbd564e7f8
parent3bc1058e664df349a40cfdac66433615c972905f (diff)
downloadeclipse.platform.swt-5da39923b173492efdb30bf0fb32d1cacd121e69.tar.gz
eclipse.platform.swt-5da39923b173492efdb30bf0fb32d1cacd121e69.tar.xz
eclipse.platform.swt-5da39923b173492efdb30bf0fb32d1cacd121e69.zip
Bug 353503 - [10.7][hovering][navigation] wrong size of pop-up dialog
for multi-hyperlink (previous was wrong when SWT style does not add scroll bars)
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
index 204adc5a71..770be6ba9d 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
@@ -111,7 +111,10 @@ public Rectangle computeTrim (int x, int y, int width, int height) {
// Always include the scroll bar in the trim even when the scroll style is overlay
OS.objc_msgSend_stret(size, OS.class_NSScrollView,
OS.sel_frameSizeForContentSize_horizontalScrollerClass_verticalScrollerClass_borderType_controlSize_scrollerStyle_,
- size, OS.class_NSScroller, OS.class_NSScroller, border, OS.NSRegularControlSize, OS.NSScrollerStyleLegacy);
+ size,
+ (style & SWT.H_SCROLL) != 0 ? OS.class_NSScroller : 0,
+ (style & SWT.V_SCROLL) != 0 ? OS.class_NSScroller : 0,
+ border, OS.NSRegularControlSize, OS.NSScrollerStyleLegacy);
} else {
size = NSScrollView.frameSizeForContentSize(size, (style & SWT.H_SCROLL) != 0, (style & SWT.V_SCROLL) != 0, border);
}

Back to the top