Bug 563575 - Fix issue where view toolbars could overlap tabs when
resizing.
Change-Id: Iaeafb069391e4010242bf1eae3b37c15aa7e91b3
Signed-off-by: Mike Marchand <mmarchand@cranksoftware.com>
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java
index 867b7ab..0853194 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/CTabRendering.java
@@ -185,8 +185,8 @@
width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth);
break;
case PART_BORDER:
- x = x - INNER_KEYLINE - OUTER_KEYLINE - sideDropWidth;
- width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth);
+ x = x - INNER_KEYLINE - OUTER_KEYLINE - sideDropWidth - ITEM_LEFT_MARGIN;
+ width = width + 2 * (INNER_KEYLINE + OUTER_KEYLINE + sideDropWidth) + ITEM_RIGHT_MARGIN;
height += borderTop + borderBottom;
y -= borderTop;
if (onBottom) {
@@ -600,7 +600,7 @@
// Remember for use in header drawing
if (cornerSize == SQUARE_CORNER) {
- //We don't require clipping. The clip is not clear coming in, but
+ //We don't require clipping. The clip is not clear coming in, but
//in the round case it is always set coming in and cleared going out
//so in the square case we can just clear off the bat.
gc.setClipping((Rectangle) null);
