summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVeronika Irvine <veronika>2004-12-06 17:10:06 +0000
committerVeronika Irvine <veronika>2004-12-06 17:10:06 +0000
commit86cb9a350616b882ff0a827dd18f2f6b7b047272 (patch)
tree696a660d123d1a3e31b3ffe180cd1abb6a758d77
parent7235f290f308c341437abf69904e64a3f96dcdb3 (diff)
downloadeclipse.platform.swt-86cb9a350616b882ff0a827dd18f2f6b7b047272.tar.gz
eclipse.platform.swt-86cb9a350616b882ff0a827dd18f2f6b7b047272.tar.xz
eclipse.platform.swt-86cb9a350616b882ff0a827dd18f2f6b7b047272.zip
bug 80120 top right control overlapping border
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
index cbf7602758..b4f646bd04 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
@@ -2573,7 +2573,7 @@ void setButtonBounds() {
switch (topRightAlignment) {
case SWT.FILL: {
int rightEdge = size.x - borderRight - 3 - maxRect.width - minRect.width;
- if (!simple) rightEdge -= 2;
+ if (!simple && borderRight > 0 && !showMax && !showMin) rightEdge -= 2;
if (single) {
if (items.length == 0 || selectedIndex == -1) {
topRightRect.x = borderLeft + 3;
@@ -2604,7 +2604,7 @@ void setButtonBounds() {
case SWT.RIGHT: {
Point topRightSize = topRight.computeSize(SWT.DEFAULT, tabHeight, false);
int rightEdge = size.x - borderRight - 3 - maxRect.width - minRect.width;
- if (!simple) rightEdge -= 2;
+ if (!simple && borderRight > 0 && !showMax && !showMin) rightEdge -= 2;
topRightRect.x = rightEdge - topRightSize.x;
topRightRect.width = topRightSize.x;
topRightRect.y = onBottom ? size.y - borderBottom - tabHeight: borderTop + 1;