Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 177438
Collapse All | Expand All

(-)src/org/eclipse/jface/preference/PreferenceDialog.java (-3 / +20 lines)
Lines 41-46 Link Here
41
import org.eclipse.jface.viewers.TreeViewer;
41
import org.eclipse.jface.viewers.TreeViewer;
42
import org.eclipse.swt.SWT;
42
import org.eclipse.swt.SWT;
43
import org.eclipse.swt.custom.BusyIndicator;
43
import org.eclipse.swt.custom.BusyIndicator;
44
import org.eclipse.swt.custom.ScrolledComposite;
44
import org.eclipse.swt.events.ControlAdapter;
45
import org.eclipse.swt.events.ControlAdapter;
45
import org.eclipse.swt.events.ControlEvent;
46
import org.eclipse.swt.events.ControlEvent;
46
import org.eclipse.swt.events.DisposeEvent;
47
import org.eclipse.swt.events.DisposeEvent;
Lines 201-206 Link Here
201
     */
202
     */
202
    Composite formTitleComposite;
203
    Composite formTitleComposite;
203
204
205
	private ScrolledComposite scrolled;
206
204
	/**
207
	/**
205
	 * Creates a new preference dialog under the control of the given preference
208
	 * Creates a new preference dialog under the control of the given preference
206
	 * manager.
209
	 * manager.
Lines 509-516 Link Here
509
	 * @return Composite
512
	 * @return Composite
510
	 */
513
	 */
511
	protected Composite createPageContainer(Composite parent) {
514
	protected Composite createPageContainer(Composite parent) {
512
		
515
	
513
		//Create an outer composite for spacing
514
		Composite outer = new Composite(parent, SWT.NONE);
516
		Composite outer = new Composite(parent, SWT.NONE);
515
		
517
		
516
		GridData outerData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
518
		GridData outerData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
Lines 518-525 Link Here
518
				
520
				
519
		outer.setLayout(new GridLayout());
521
		outer.setLayout(new GridLayout());
520
		outer.setLayoutData(outerData);
522
		outer.setLayoutData(outerData);
523
		
524
		//Create an outer composite for spacing
525
		scrolled = new ScrolledComposite(outer, SWT.V_SCROLL | SWT.H_SCROLL);
521
526
522
		Composite result = new Composite(outer, SWT.NONE);
527
		scrolled.setExpandHorizontal(true);
528
		scrolled.setExpandVertical(true);
529
		
530
		GridData scrolledData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
531
				| GridData.GRAB_VERTICAL);
532
				
533
		scrolled.setLayoutData(scrolledData);
534
		
535
		Composite result = new Composite(scrolled, SWT.NONE);
523
		
536
		
524
		GridData resultData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
537
		GridData resultData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
525
				| GridData.GRAB_VERTICAL);
538
				| GridData.GRAB_VERTICAL);
Lines 527-532 Link Here
527
		result.setLayout(getPageLayout());
540
		result.setLayout(getPageLayout());
528
		result.setLayoutData(resultData);
541
		result.setLayoutData(resultData);
529
		
542
		
543
		scrolled.setContent(result);
544
		
530
		return result;
545
		return result;
531
	}
546
	}
532
547
Lines 1229-1234 Link Here
1229
				currentPage.setSize(containerSize);
1244
				currentPage.setSize(containerSize);
1230
			}
1245
			}
1231
		}
1246
		}
1247
		
1248
		scrolled.setMinSize(contentSize);
1232
		// Ensure that all other pages are invisible
1249
		// Ensure that all other pages are invisible
1233
		// (including ones that triggered an exception during
1250
		// (including ones that triggered an exception during
1234
		// their creation).
1251
		// their creation).

Return to bug 177438