Attachment 146644 Details for Bug 229294 – Patch v01

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

[patch] Patch v01

ProgressLayout 01.txt (text/plain), 2.95 KB, created by Prakash Rangaraj

on 2009-09-08 05:23:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Prakash Rangaraj

Created: 2009-09-08 05:23:23 EDT

Size: 2.95 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java,v
>retrieving revision 1.53
>diff -u -r1.53 ProgressInfoItem.java
>--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java	4 Aug 2009 11:08:45 -0000	1.53
>+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressInfoItem.java	8 Sep 2009 08:00:55 -0000
>@@ -194,19 +194,24 @@
> 	/**
> 	 * Create the child widgets of the receiver.
> 	 */
>-	/**
>-	 * 
>-	 */
> 	protected void createChildren() {
> 
> 		FormLayout layout = new FormLayout();
> 		setLayout(layout);
> 
> 		jobImageLabel = new Label(this, SWT.NONE);
>-		jobImageLabel.setImage(getInfoImage());
>+		Image infoImage = getInfoImage();
>+		jobImageLabel.setImage(infoImage);
> 		FormData imageData = new FormData();
>-		imageData.top = new FormAttachment(IDialogConstants.VERTICAL_SPACING);
>-		imageData.left = new FormAttachment(
>+		if (infoImage != null) {
>+			// position it in the center
>+			imageData.top = new FormAttachment(50,
>+					-infoImage.getBounds().height / 2);
>+		} else {
>+			imageData.top = new FormAttachment(0,
>+					IDialogConstants.VERTICAL_SPACING);
>+		}
>+		imageData.left = new FormAttachment(0,
> 				IDialogConstants.HORIZONTAL_SPACING / 2);
> 		jobImageLabel.setLayoutData(imageData);
> 
>@@ -214,14 +219,10 @@
> 		setMainText();
> 
> 		actionBar = new ToolBar(this, SWT.FLAT);
>-		actionBar.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_ARROW)); // set
>-		// cursor
>-		// to
>-		// overwrite
>-		// any
>-		// busy
>+		actionBar.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_ARROW));
>+
>+		// set cursor to overwrite any busy cursor we might have
> 
>-		// cursor we might have
> 		actionButton = new ToolItem(actionBar, SWT.NONE);
> 		actionButton
> 				.setToolTipText(ProgressMessages.NewProgressView_CancelJobToolTip);
>@@ -255,11 +256,12 @@
> 		updateToolBarValues();
> 
> 		FormData progressData = new FormData();
>-		progressData.top = new FormAttachment(IDialogConstants.VERTICAL_SPACING);
>+		progressData.top = new FormAttachment(0,
>+				IDialogConstants.VERTICAL_SPACING);
> 		progressData.left = new FormAttachment(jobImageLabel,
> 				IDialogConstants.HORIZONTAL_SPACING / 2);
> 		progressData.right = new FormAttachment(actionBar,
>-				IDialogConstants.HORIZONTAL_SPACING);
>+				IDialogConstants.HORIZONTAL_SPACING * -1);
> 		progressLabel.setLayoutData(progressData);
> 
> 		mouseListener = new MouseAdapter() {
>@@ -709,7 +711,7 @@
> 			FormData linkData = new FormData();
> 			linkData.top = new FormAttachment(progressBar,
> 					IDialogConstants.VERTICAL_SPACING);
>-			linkData.left = new FormAttachment(
>+			linkData.left = new FormAttachment(0,
> 					IDialogConstants.HORIZONTAL_SPACING);
> 			linkData.right = new FormAttachment(progressBar, 0, SWT.RIGHT);
> 			// Give an initial value so as to constrain the link shortening

Actions: View | Diff

Attachments on bug 229294: 97975 | 98634 | 146644