Attachment 30876 Details for Bug 85899 – Proposed patch

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

[patch] Proposed patch

85899.patch (text/plain), 3.06 KB, created by Nick Edgar

on 2005-11-30 12:03:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Edgar

Created: 2005-11-30 12:03:17 EST

Size: 3.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/EmptyTabFolder.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/EmptyTabFolder.java,v
>retrieving revision 1.6
>diff -u -r1.6 EmptyTabFolder.java
>--- Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/EmptyTabFolder.java	15 Jun 2005 18:41:21 -0000	1.6
>+++ Eclipse UI/org/eclipse/ui/internal/presentations/defaultpresentation/EmptyTabFolder.java	30 Nov 2005 17:03:53 -0000
>@@ -61,6 +61,22 @@
>      */
>     public Point computeSize(int widthHint, int heightHint) {
>         if (childControl != null) {
>+        	// Fix for bug 85899 [Perspectives] [RCP]Standalone view does not divide space in 
>+        	//   proper ratio with reference when added to IPageLayout with showTitle parameter false
>+        	// If the childControl is a content proxy (a Composite with no children -- see PresentablePartFolder constructor),
>+        	// then computeSize returns 64x64, which is inappropriate.
>+        	// Note that this happens even if the Composite has a Layout that returns 0@0.
>+        	// Instead, use the sizes of the margins.  This is equivalent to calling control.computeSize(...)
>+        	// if the childControl returned 0@0 for its preferred size.
>+        	if (childControl instanceof Composite) {
>+        		Composite composite = (Composite) childControl;
>+        		if (composite.getChildren().length == 0) {
>+        			EnhancedFillLayout layout = (EnhancedFillLayout) control.getLayout();
>+        			int w = widthHint == SWT.DEFAULT ? layout.xmargin * 2 : widthHint;
>+        			int h = heightHint == SWT.DEFAULT ? layout.ymargin * 2 : heightHint;
>+        			return new Point(w, h);
>+        		}
>+        	}
>             return childControl.computeSize(widthHint, heightHint);
>         }
>         return new Point(0,0);
>Index: Eclipse UI/org/eclipse/ui/internal/presentations/util/PresentablePartFolder.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/presentations/util/PresentablePartFolder.java,v
>retrieving revision 1.12
>diff -u -r1.12 PresentablePartFolder.java
>--- Eclipse UI/org/eclipse/ui/internal/presentations/util/PresentablePartFolder.java	24 Oct 2005 19:06:48 -0000	1.12
>+++ Eclipse UI/org/eclipse/ui/internal/presentations/util/PresentablePartFolder.java	30 Nov 2005 17:03:53 -0000
>@@ -108,6 +108,7 @@
>         
>         //toolbarProxy = new ProxyControl(folder.getToolbarParent());
>         
>+        // NOTE: if the shape of contentProxy changes, the fix for bug 85899 in EmptyTabFolder.computeSize may need adjustment.
>         contentProxy = new Composite(folder.getContentParent(), SWT.NONE);
>         contentProxy.setVisible(false);
>         for (Control current = contentProxy; current != folder.getControl().getParent(); current = current.getParent()) {

Actions: View | Diff

Attachments on bug 85899: 18121 | 18122 | 20226 | 30876