Attachment 62972 Details for Bug 177438 – Patch

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

[patch] Patch

177438.txt (text/plain), 2.47 KB, created by Tod Creasey

on 2007-04-04 15:20:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2007-04-04 15:20:05 EDT

Size: 2.47 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/preference/PreferenceDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceDialog.java,v
>retrieving revision 1.91
>diff -u -r1.91 PreferenceDialog.java
>--- src/org/eclipse/jface/preference/PreferenceDialog.java	3 Apr 2007 14:30:50 -0000	1.91
>+++ src/org/eclipse/jface/preference/PreferenceDialog.java	4 Apr 2007 19:18:26 -0000
>@@ -41,6 +41,7 @@
> import org.eclipse.jface.viewers.TreeViewer;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.custom.BusyIndicator;
>+import org.eclipse.swt.custom.ScrolledComposite;
> import org.eclipse.swt.events.ControlAdapter;
> import org.eclipse.swt.events.ControlEvent;
> import org.eclipse.swt.events.DisposeEvent;
>@@ -201,6 +202,8 @@
>      */
>     Composite formTitleComposite;
> 
>+	private ScrolledComposite scrolled;
>+
> 	/**
> 	 * Creates a new preference dialog under the control of the given preference
> 	 * manager.
>@@ -509,8 +512,7 @@
> 	 * @return Composite
> 	 */
> 	protected Composite createPageContainer(Composite parent) {
>-		
>-		//Create an outer composite for spacing
>+	
> 		Composite outer = new Composite(parent, SWT.NONE);
> 		
> 		GridData outerData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
>@@ -518,8 +520,19 @@
> 				
> 		outer.setLayout(new GridLayout());
> 		outer.setLayoutData(outerData);
>+		
>+		//Create an outer composite for spacing
>+		scrolled = new ScrolledComposite(outer, SWT.V_SCROLL | SWT.H_SCROLL);
> 
>-		Composite result = new Composite(outer, SWT.NONE);
>+		scrolled.setExpandHorizontal(true);
>+		scrolled.setExpandVertical(true);
>+		
>+		GridData scrolledData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
>+				| GridData.GRAB_VERTICAL);
>+				
>+		scrolled.setLayoutData(scrolledData);
>+		
>+		Composite result = new Composite(scrolled, SWT.NONE);
> 		
> 		GridData resultData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL
> 				| GridData.GRAB_VERTICAL);
>@@ -527,6 +540,8 @@
> 		result.setLayout(getPageLayout());
> 		result.setLayoutData(resultData);
> 		
>+		scrolled.setContent(result);
>+		
> 		return result;
> 	}
> 
>@@ -1229,6 +1244,8 @@
> 				currentPage.setSize(containerSize);
> 			}
> 		}
>+		
>+		scrolled.setMinSize(contentSize);
> 		// Ensure that all other pages are invisible
> 		// (including ones that triggered an exception during
> 		// their creation).

Actions: View | Diff

Attachments on bug 177438: 62826 | 62866 | 62867 | 62972