Attachment #191690 for bug #337475

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

Lines 56-61 Link Here

(-)src/org/eclipse/rap/demo/controls/ControlsDemo.java (-1 / +1 lines)
56	topFolder.marginHeight = 5;	56	topFolder.marginHeight = 5;
57		57
58	final ExampleTab[] tabs = new ExampleTab[] {	58	final ExampleTab[] tabs = new ExampleTab[] {
		59	new ShellTab( topFolder ),
59	new ButtonTab( topFolder ),	60	new ButtonTab( topFolder ),
60	// new RequestTab( topFolder ),	61	// new RequestTab( topFolder ),
61	new CBannerTab( topFolder ),	62	new CBannerTab( topFolder ),
Lines 73-79 Link Here
73	new LinkTab( topFolder ),	74	new LinkTab( topFolder ),
74	new SashTab( topFolder ),	75	new SashTab( topFolder ),
75	new SashFormTab( topFolder ),	76	new SashFormTab( topFolder ),
76	new ShellTab( topFolder ),
77	new TabFolderTab( topFolder ),	77	new TabFolderTab( topFolder ),
78	new CTabFolderTab( topFolder ),	78	new CTabFolderTab( topFolder ),
79	new TableTab( topFolder ),	79	new TableTab( topFolder ),

Lines 31-36 Link Here

(-)src/org/eclipse/rap/demo/controls/ShellTab.java (-6 / +21 lines)
31	private final java.util.List shells;	31	private final java.util.List shells;
32	private int shellCounter;	32	private int shellCounter;
33	private final ShellAdapter confirmCloseListener;	33	private final ShellAdapter confirmCloseListener;
		34	private final ShellAdapter shellActivatedListener;
		35	private final ShellAdapter shellDeactivatedListener;
34	private Image shellImage;	36	private Image shellImage;
35	private Button createInvisibleButton;	37	private Button createInvisibleButton;
36	private Button createAsDialogButton;	38	private Button createAsDialogButton;
Lines 52-57 Link Here
52	event.doit = canClose;	54	event.doit = canClose;
53	}	55	}
54	};	56	};
		57	shellActivatedListener = new ShellAdapter() {
		58	public void shellActivated( ShellEvent e ) {
		59	((Shell)e.getSource()).getData();
		60	}
		61	};
		62	shellDeactivatedListener = new ShellAdapter() {
		63	public void shellDeactivated( ShellEvent e ) {
		64	((Shell)e.getSource()).close();
		65	}
		66	};
55	setDefaultStyle( SWT.SHELL_TRIM );	67	setDefaultStyle( SWT.SHELL_TRIM );
56	}	68	}
57		69
Lines 188-198 Link Here
188		200
189	private void createShell() {	201	private void createShell() {
190	Shell shell;	202	Shell shell;
191	if( createAsDialogButton.getSelection() ) {	203	// if( createAsDialogButton.getSelection() ) {
192	shell = new Shell( getShell(), getStyle() );	204	// shell = new Shell( getShell(), getStyle() );
193	} else {	205	// } else {
194	shell = new Shell( getShell().getDisplay(), getStyle() );	206	// shell = new Shell( getShell().getDisplay(), getStyle() );
195	}	207	// }
		208	shell = new Shell( getShell(), getStyle() );
196	// if( customBgColorButton.getSelection() ) {	209	// if( customBgColorButton.getSelection() ) {
197	// shell.setBackground( BG_COLOR_BROWN );	210	// shell.setBackground( BG_COLOR_BROWN );
198	// }	211	// }
Lines 206-211 Link Here
206	shell.setText( "Test Shell " + shellCounter );	219	shell.setText( "Test Shell " + shellCounter );
207	shell.setAlpha( alpha );	220	shell.setAlpha( alpha );
208	shell.setImage( shellImage );	221	shell.setImage( shellImage );
		222	shell.addShellListener( shellActivatedListener );
		223	shell.addShellListener( shellDeactivatedListener );
209	if( confirmCloseButton.getSelection() ) {	224	if( confirmCloseButton.getSelection() ) {
210	shell.addShellListener( confirmCloseListener );	225	shell.addShellListener( confirmCloseListener );
211	}	226	}
Lines 348-354 Link Here
348	private Point getNextShellLocation() {	363	private Point getNextShellLocation() {
349	Point result = getShell().getLocation();	364	Point result = getShell().getLocation();
350	int count = getShells().length % 12;	365	int count = getShells().length % 12;
351	result.x += 50 + count * 10;	366	result.x += 200 + count * 10;
352	result.y += 50 + count * 10;	367	result.y += 50 + count * 10;
353	return result ;	368	return result ;
354	}	369	}

Return to bug 337475