diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java index f7f1824..c8ba66d 100644 --- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java +++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java @@ -23,6 +23,7 @@ import org.eclipse.rwt.internal.util.NumberFormatUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.custom.ScrolledComposite; import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.*; import org.eclipse.swt.internal.events.ActivateEvent; @@ -671,6 +672,8 @@ result &= ( control.getStyle() & SWT.NO_FOCUS ) == 0; result &= control.getClass() != Composite.class; result &= control.getClass() != SashForm.class; + result &= control.getClass() != ScrolledComposite.class; + return result; } diff --git a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/Form.java b/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/Form.java index 0b10ac4..bf42f55 100644 --- a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/Form.java +++ b/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/Form.java @@ -169,7 +169,7 @@ public Form(Composite parent, int style) { // RAP [rh] SWT.NO_BACKGROUND not implemented // super(parent, SWT.NO_BACKGROUND | style); - super(parent, style); + super(parent, SWT.NO_FOCUS | style); super.setLayout(new FormLayout()); head = new FormHeading(this, SWT.NULL); head.setMenu(parent.getMenu()); @@ -765,7 +765,7 @@ } this.selectionText = text; } - + /** * Returns the message manager that will keep track of messages in this * form. diff --git a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/LayoutComposite.java b/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/LayoutComposite.java index b51cca8..b94035c 100644 --- a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/LayoutComposite.java +++ b/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/LayoutComposite.java @@ -9,6 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.ui.forms.widgets; +import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.*; /** @@ -21,7 +22,7 @@ */ /* package */class LayoutComposite extends Composite { public LayoutComposite(Composite parent, int style) { - super(parent, style); + super(parent, SWT.NO_FOCUS | style); setMenu(parent.getMenu()); } public Point computeSize(int wHint, int hHint, boolean changed) { diff --git a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java b/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java index fcc02fd..8987c75 100644 --- a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java +++ b/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java @@ -574,7 +574,7 @@ * the parent widget */ public FormHeading(Composite parent, int style) { - super(parent, style); + super(parent, SWT.NO_FOCUS | style); setBackgroundMode(SWT.INHERIT_DEFAULT); // RAP [rh] Paint events missing // addListener(SWT.Paint, new Listener() { diff --git a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java b/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java index 092d13b..f8eedc7 100644 --- a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java +++ b/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java @@ -235,7 +235,7 @@ } public TitleRegion(Composite parent) { - super(parent, SWT.NULL); + super(parent, SWT.NO_FOCUS); titleLabel = new Label(this, SWT.WRAP); titleLabel.setVisible(false); titleCache = new SizeCache();