Attachment 175271 Details for Bug 320784 – SWT toolbar height patch

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

[patch] SWT toolbar height patch

320784_patch.txt (text/plain), 2.28 KB, created by Bogdan Gheorghe

on 2010-07-26 17:24:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bogdan Gheorghe

Created: 2010-07-26 17:24:18 EDT

Size: 2.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.e4.ui.widgets
>Index: src/org/eclipse/e4/ui/widgets/CTabFolder.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.widgets/src/org/eclipse/e4/ui/widgets/CTabFolder.java,v
>retrieving revision 1.11
>diff -u -r1.11 CTabFolder.java
>--- src/org/eclipse/e4/ui/widgets/CTabFolder.java	26 Jul 2010 20:36:43 -0000	1.11
>+++ src/org/eclipse/e4/ui/widgets/CTabFolder.java	26 Jul 2010 21:23:36 -0000
>@@ -2234,19 +2234,22 @@
> 					topRightRect.y = onBottom ? size.y - borderBottom - tabHeight: borderTop + 1;
> 					topRightRect.height = tabHeight - 1;
> 				} else {
>-					int compWidth = size.x - borderLeft - borderRight;
>+					Rectangle bodyTrim = renderer.computeTrim(CTabFolderRenderer.PART_BODY, SWT.NONE, 0, 0, 0, 0);
> 					Point preferredSize = topRight.computeSize(SWT.DEFAULT, SWT.DEFAULT);
>+					int bodyRight = bodyTrim.width + bodyTrim.x;
>+					int bodyLeft = -bodyTrim.x;
>+					int compWidth = size.x - bodyLeft - bodyRight;
> 					if (compWidth > preferredSize.x) {
> 						topRightRect.width = preferredSize.x;
>-						topRightRect.y = tabHeight + 1 + borderTop;
>+						topRightRect.y = -bodyTrim.y;
> 						topRightRect.height = preferredSize.y;
>-						topRightRect.x = compWidth - preferredSize.x + borderLeft;
>+						topRightRect.x = size.x - preferredSize.x - bodyRight;
> 					} else {
> 						preferredSize = topRight.computeSize(compWidth, SWT.DEFAULT);
> 						topRightRect.width = compWidth;
>-						topRightRect.y = tabHeight + 1 + borderTop;
>+						topRightRect.y = -bodyTrim.y;
> 						topRightRect.height = preferredSize.y;
>-						topRightRect.x = compWidth - preferredSize.x + borderLeft;
>+						topRightRect.x = size.x - preferredSize.x - bodyRight;
> 					}
> 				}
> 			}
>@@ -3458,7 +3461,7 @@
> 	gc.dispose();
> 	if (fixedTabHeight == SWT.DEFAULT && topRight != null) {
> 		int topHeight = topRight.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
>-		topHeight += renderer.computeTrim(CTabFolderRenderer.PART_HEADER, SWT.NONE, 0,0,0,0).height;
>+		topHeight += renderer.computeTrim(CTabFolderRenderer.PART_HEADER, SWT.NONE, 0,0,0,0).height + 1;
> 		tabHeight = Math.max(topHeight, tabHeight);
> 	}
> 	if (!force && tabHeight == oldHeight) return false;

Actions: View | Diff

Attachments on bug 320784: 175271 | 175278 | 175279 | 175282