Attachment #223359 for bug #321274

View | Details | Raw Unified | Return to bug 321274
Collapse All | Expand All

Lines 23-28 Link Here

(-)a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rwt/lifecycle/ControlLCAUtil.java (+3 lines)
23	import org.eclipse.rwt.internal.util.NumberFormatUtil;	23	import org.eclipse.rwt.internal.util.NumberFormatUtil;
24	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
25	import org.eclipse.swt.custom.SashForm;	25	import org.eclipse.swt.custom.SashForm;
		26	import org.eclipse.swt.custom.ScrolledComposite;
26	import org.eclipse.swt.events.*;	27	import org.eclipse.swt.events.*;
27	import org.eclipse.swt.graphics.*;	28	import org.eclipse.swt.graphics.*;
28	import org.eclipse.swt.internal.events.ActivateEvent;	29	import org.eclipse.swt.internal.events.ActivateEvent;
Lines 671-676 Link Here
671	result &= ( control.getStyle() & SWT.NO_FOCUS ) == 0;	672	result &= ( control.getStyle() & SWT.NO_FOCUS ) == 0;
672	result &= control.getClass() != Composite.class;	673	result &= control.getClass() != Composite.class;
673	result &= control.getClass() != SashForm.class;	674	result &= control.getClass() != SashForm.class;
		675	result &= control.getClass() != ScrolledComposite.class;
		676
674	return result;	677	return result;
675	}	678	}
676		679

Lines 169-175 Link Here

(-)a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/Form.java (-2 / +2 lines)
169	public Form(Composite parent, int style) {	169	public Form(Composite parent, int style) {
170	// RAP [rh] SWT.NO_BACKGROUND not implemented	170	// RAP [rh] SWT.NO_BACKGROUND not implemented
171	// super(parent, SWT.NO_BACKGROUND \| style);	171	// super(parent, SWT.NO_BACKGROUND \| style);
172	super(parent, style);	172	super(parent, SWT.NO_FOCUS \| style);
173	super.setLayout(new FormLayout());	173	super.setLayout(new FormLayout());
174	head = new FormHeading(this, SWT.NULL);	174	head = new FormHeading(this, SWT.NULL);
175	head.setMenu(parent.getMenu());	175	head.setMenu(parent.getMenu());
Lines 765-771 Link Here
765	}	765	}
766	this.selectionText = text;	766	this.selectionText = text;
767	}	767	}
768		768
769	/**	769	/**
770	* Returns the message manager that will keep track of messages in this	770	* Returns the message manager that will keep track of messages in this
771	* form.	771	* form.

Lines 9-14 Link Here

(-)a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/LayoutComposite.java (-1 / +2 lines)
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.forms.widgets;	11	package org.eclipse.ui.forms.widgets;
		12	import org.eclipse.swt.SWT;
12	import org.eclipse.swt.graphics.Point;	13	import org.eclipse.swt.graphics.Point;
13	import org.eclipse.swt.widgets.*;	14	import org.eclipse.swt.widgets.*;
14	/**	15	/**
Lines 21-27 Link Here
21	*/	22	*/
22	/* package */class LayoutComposite extends Composite {	23	/* package */class LayoutComposite extends Composite {
23	public LayoutComposite(Composite parent, int style) {	24	public LayoutComposite(Composite parent, int style) {
24	super(parent, style);	25	super(parent, SWT.NO_FOCUS \| style);
25	setMenu(parent.getMenu());	26	setMenu(parent.getMenu());
26	}	27	}
27	public Point computeSize(int wHint, int hHint, boolean changed) {	28	public Point computeSize(int wHint, int hHint, boolean changed) {

Lines 574-580 Link Here

(-)a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/FormHeading.java (-1 / +1 lines)
574	* the parent widget	574	* the parent widget
575	*/	575	*/
576	public FormHeading(Composite parent, int style) {	576	public FormHeading(Composite parent, int style) {
577	super(parent, style);	577	super(parent, SWT.NO_FOCUS \| style);
578	setBackgroundMode(SWT.INHERIT_DEFAULT);	578	setBackgroundMode(SWT.INHERIT_DEFAULT);
579	// RAP [rh] Paint events missing	579	// RAP [rh] Paint events missing
580	// addListener(SWT.Paint, new Listener() {	580	// addListener(SWT.Paint, new Listener() {

Lines 235-241 Link Here

(-)a/bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java (-1 / +1 lines)
235	}	235	}
236		236
237	public TitleRegion(Composite parent) {	237	public TitleRegion(Composite parent) {
238	super(parent, SWT.NULL);	238	super(parent, SWT.NO_FOCUS);
239	titleLabel = new Label(this, SWT.WRAP);	239	titleLabel = new Label(this, SWT.WRAP);
240	titleLabel.setVisible(false);	240	titleLabel.setVisible(false);
241	titleCache = new SizeCache();	241	titleCache = new SizeCache();

Return to bug 321274