From 8c4edac2ff9ad5606ba82cb7cc1fc78365f94a97 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Wed, 26 Sep 2007 14:09:20 +0000
Subject: [PATCH] Tools setting tab resizing improvement.

---
 .../ui/properties/ToolSettingsTab.java         |  9 +++++++++
 .../org/eclipse/cdt/ui/newui/AbstractPage.java | 18 +++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
index 3521fefd695..545145827e4 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolSettingsTab.java
@@ -29,6 +29,7 @@ import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.internal.macros.BuildMacroProvider;
+import org.eclipse.cdt.ui.newui.AbstractPage;
 import org.eclipse.cdt.ui.newui.PageLayout;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.preference.IPreferencePageContainer;
@@ -50,6 +51,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.ScrollBar;
 
 
 public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPreferencePageContainer {
@@ -381,6 +383,13 @@ public class ToolSettingsTab extends AbstractCBuildPropertyTab implements IPrefe
 				} else {
 					displayOptionsForTool(toolListElement);
 				}
+				
+				ScrollBar sb = containerSC.getHorizontalBar();
+				if (sb != null && sb.isVisible()) {
+					settingsPageContainer.pack(true);
+					containerSC.setMinSize(settingsPageContainer.getSize());
+					((AbstractPage)page).resize();
+				}
 			}
 		}
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
index 56e8a9ae5f4..d0e77367f9e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
@@ -55,6 +55,7 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.ui.IWorkbenchPart;
@@ -136,6 +137,7 @@ implements
 	private Label errIcon;
 	private Label errMessage;
 	private Composite errPane;
+	private Composite parentComposite;
 	/*
 	 * Bookeeping variables
 	 */
@@ -317,16 +319,16 @@ implements
 	}
 	
 	public void createWidgets(Composite c) {
-		Composite comp = new Composite(c, SWT.NONE);
-		comp.setLayoutData(new GridData(GridData.FILL_BOTH));
+		parentComposite = new Composite(c, SWT.NONE);
+		parentComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
 		
 		itabs.clear(); 
 		if (!isSingle()) {
-			comp.setLayout(new FillLayout());
-			folder = new TabFolder(comp, SWT.NONE);
+			parentComposite.setLayout(new FillLayout());
+			folder = new TabFolder(parentComposite, SWT.NONE);
 //			folder.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_DARK_GRAY));
 		}
-		loadExtensionsSynchronized(comp);
+		loadExtensionsSynchronized(parentComposite);
 		
 		// Set listener after data load, to avoid firing
 		// selection event on not-initialized tab items 
@@ -1007,4 +1009,10 @@ implements
 				((IPropertyChangeListener)part).propertyChange(new PropertyChangeEvent(res, PreferenceConstants.PREF_SHOW_CU_CHILDREN, null, null));
 		}
 	}
+	
+	public void resize() {
+		Shell sh = parentComposite.getShell();
+		sh.setSize(sh.computeSize(SWT.DEFAULT, SWT.DEFAULT, true));
+	}
+	
 }