Attachment 75257 Details for Bug 196692 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

patch196692.txt (text/plain), 1.80 KB, created by Adam Archer

on 2007-08-02 13:54:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Archer

Created: 2007-08-02 13:54:11 EDT

Size: 1.80 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.forms
>Index: src/org/eclipse/ui/internal/forms/widgets/FormUtil.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormUtil.java,v
>retrieving revision 1.27
>diff -u -r1.27 FormUtil.java
>--- src/org/eclipse/ui/internal/forms/widgets/FormUtil.java	11 Jul 2007 20:03:13 -0000	1.27
>+++ src/org/eclipse/ui/internal/forms/widgets/FormUtil.java	2 Aug 2007 17:46:19 -0000
>@@ -11,8 +11,6 @@
>  *******************************************************************************/
> package org.eclipse.ui.internal.forms.widgets;
> 
>-import com.ibm.icu.text.BreakIterator;
>-
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.ScrolledComposite;
> import org.eclipse.swt.events.MouseEvent;
>@@ -35,10 +33,13 @@
> import org.eclipse.swt.widgets.ScrollBar;
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.forms.widgets.ColumnLayout;
>+import org.eclipse.ui.forms.widgets.ExpandableComposite;
> import org.eclipse.ui.forms.widgets.Form;
> import org.eclipse.ui.forms.widgets.FormToolkit;
> import org.eclipse.ui.forms.widgets.ILayoutExtension;
> 
>+import com.ibm.icu.text.BreakIterator;
>+
> public class FormUtil {
> 	public static final String PLUGIN_ID = "org.eclipse.ui.forms"; //$NON-NLS-1$
> 
>@@ -399,7 +400,12 @@
> 		if ((c.getStyle() & SWT.WRAP) != 0)
> 			return true;
> 		if (c instanceof Composite) {
>-			return ((Composite) c).getLayout() instanceof ILayoutExtension;
>+			if (((Composite) c).getLayout() instanceof ILayoutExtension)
>+				return true;
>+			for (Composite parent = c.getParent(); parent != null; parent = parent.getParent()) {
>+				if (parent instanceof ExpandableComposite)
>+					return true;
>+			}
> 		}
> 		return false;
> 	}

Actions: View | Diff

Attachments on bug 196692: 73871 | 73877 | 74193 | 75257 | 268178 | 268216 | 268217 | 268234 | 268252 | 273142