Attachment 73877 Details for Bug 196692 – Fix for this defect

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

Fix for this defect

formutil_patch.txt (text/plain), 2.04 KB, created by Stefan Xenos

on 2007-07-16 13:52:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Xenos

Created: 2007-07-16 13:52:32 EDT

Size: 2.04 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	16 Jul 2007 17:48:43 -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;
>@@ -34,11 +32,12 @@
> import org.eclipse.swt.widgets.Layout;
> 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.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$
> 
>@@ -396,26 +395,15 @@
> 	}
> 
> 	public static boolean isWrapControl(Control c) {
>-		if ((c.getStyle() & SWT.WRAP) != 0)
>-			return true;
>-		if (c instanceof Composite) {
>-			return ((Composite) c).getLayout() instanceof ILayoutExtension;
>-		}
>-		return false;
>+	    return true;
> 	}
> 
> 	public static int getWidthHint(int wHint, Control c) {
>-		boolean wrap = isWrapControl(c);
>-		return wrap ? wHint : SWT.DEFAULT;
>+	    return wHint;
> 	}
> 
> 	public static int getHeightHint(int hHint, Control c) {
>-		if (c instanceof Composite) {
>-			Layout layout = ((Composite) c).getLayout();
>-			if (layout instanceof ColumnLayout)
>-				return hHint;
>-		}
>-		return SWT.DEFAULT;
>+	    return hHint;
> 	}
> 
> 	public static int computeMinimumWidth(Control c, boolean changed) {

Actions: View

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