Bug 90281 Replace With Uncommitted changes dialog problems

2 files changed, 8 insertions, 5 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
index ce8665d5e..0a6793039 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java
@@ -305,10 +305,6 @@ abstract public class DetailsDialog extends Dialog {
 	protected Composite createComposite(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout();
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
 		composite.setFont(parent.getFont());
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingSelectionArea.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingSelectionArea.java
index e3fcf1cf1..f85443fe3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingSelectionArea.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/ResourceMappingSelectionArea.java
@@ -88,6 +88,12 @@ public class ResourceMappingSelectionArea extends DialogArea {
      */
     public void createArea(Composite parent) {
         Composite composite = createComposite(parent, 1, true);
+        GridLayout layout = new GridLayout(1, false);
+        layout.marginHeight = 0;
+        layout.marginWidth = 0;
+        layout.verticalSpacing = 0;
+        layout.horizontalSpacing = 0;
+        composite.setLayout(layout);
         
         if (description != null)
             createWrappingLabel(composite, description, 1);
@@ -95,7 +101,7 @@ public class ResourceMappingSelectionArea extends DialogArea {
         viewer = CheckboxTableViewer.newCheckList(composite, SWT.SINGLE | SWT.BORDER);
         GridData data = new GridData(GridData.FILL_BOTH);
         data.heightHint = 100;
-        data.widthHint = 200;
+        data.widthHint = 300;
         viewer.getControl().setLayoutData(data);
         viewer.setContentProvider(new BaseWorkbenchContentProvider());
         viewer.setLabelProvider(new ResourceMappingLabelProvider());
@@ -156,6 +162,7 @@ public class ResourceMappingSelectionArea extends DialogArea {
         GridLayout layout = new GridLayout();
         layout.numColumns = 2; // this is incremented by createButton
         layout.makeColumnsEqualWidth = true;
+        layout.marginWidth = 0;
         buttons.setLayout(layout);
         data = new GridData(GridData.HORIZONTAL_ALIGN_END
                 | GridData.VERTICAL_ALIGN_CENTER);