Attachment 34776 Details for Bug 127658 – patch

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

[patch] patch

org.eclipse.jface_127658.txt (text/plain), 2.96 KB, created by Curtis d'Entremont

on 2006-02-15 11:21:07 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis d'Entremont

Created: 2006-02-15 11:21:07 EST

Size: 2.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/dialogs/StatusDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.jface/src/org/eclipse/jface/dialogs/StatusDialog.java,v
>retrieving revision 1.6
>diff -u -r1.6 StatusDialog.java
>--- src/org/eclipse/jface/dialogs/StatusDialog.java	7 Feb 2006 19:47:04 -0000	1.6
>+++ src/org/eclipse/jface/dialogs/StatusDialog.java	15 Feb 2006 16:18:14 -0000
>@@ -218,16 +218,50 @@
> 		}
> 
> 		layout.marginHeight = 0;
>-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
>+        layout.marginLeft = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
>+        layout.marginWidth = 0;
> 		composite.setLayout(layout);
> 		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> 
>+        if (!fStatusLineAboveButtons && (isHelpAvailable() || TrayDialog.isDialogHelpAvailable())) {
>+        	createHelpControl(composite);
>+        }
> 		fStatusLine = new MessageLine(composite);
> 		fStatusLine.setAlignment(SWT.LEFT);
>-		fStatusLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>+        GridData statusData = new GridData(GridData.FILL_HORIZONTAL);
> 		fStatusLine.setErrorStatus(null);
>+        if (fStatusLineAboveButtons && (isHelpAvailable() || TrayDialog.isDialogHelpAvailable())) {
>+        	statusData.horizontalSpan = 2;
>+        	createHelpControl(composite);
>+        }
>+		fStatusLine.setLayoutData(statusData);
> 		applyDialogFont(composite);
>-		super.createButtonBar(composite);
>+
>+		/*
>+		 * This code is duplicated from Dialog#createButtonBar. We do not want
>+		 * to call the TrayDialog implementation because it adds a help control.
>+		 * Since this is a custom button bar, we explicitly added the help control
>+		 * in an appropriate place above, and we use the Dialog implementation of
>+		 * createButtonBar, which does not add a help control.
>+		 */
>+		Composite buttonComposite = new Composite(composite, SWT.NONE);
>+		// create a layout with spacing and margins appropriate for the font
>+		// size.
>+		layout = new GridLayout();
>+		layout.numColumns = 0; // this is incremented by createButton
>+		layout.makeColumnsEqualWidth = true;
>+		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
>+		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
>+		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
>+		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
>+		buttonComposite.setLayout(layout);
>+		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END
>+				| GridData.VERTICAL_ALIGN_CENTER);
>+		buttonComposite.setLayoutData(data);
>+		buttonComposite.setFont(composite.getFont());
>+		
>+		// Add the buttons to the button bar.
>+		createButtonsForButtonBar(buttonComposite);
> 		return composite;
> 	}
>

Actions: View | Diff

Attachments on bug 127658: 34695 | 34776 | 36435 | 36451