summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Northover <steve>2005-05-26 15:34:15 +0000
committerSteve Northover <steve>2005-05-26 15:34:15 +0000
commitab1b64d57fe6c77ae2f36892ce5b5052f263eb56 (patch)
treecdc6a8019e7219e16e053b4dd4860013246dfc38
parente88f9a0dc6e6115cb55553159ce77a62a8efc17f (diff)
downloadeclipse.platform.swt-ab1b64d57fe6c77ae2f36892ce5b5052f263eb56.tar.gz
eclipse.platform.swt-ab1b64d57fe6c77ae2f36892ce5b5052f263eb56.tar.xz
eclipse.platform.swt-ab1b64d57fe6c77ae2f36892ce5b5052f263eb56.zip
borders not drawn for composites unless a key was hookedv3136
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java
index 4814bc5037..d93c0f6106 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Composite.java
@@ -258,7 +258,11 @@ void drawBackground (int control) {
if ((style & SWT.NO_FOCUS) == 0 && hooksKeys ()) {
drawFocus (control, hasFocus () && drawFocusRing (), hasBorder (), getParentBackground (), inset ());
} else {
- drawBackground (control, getParentBackground ());
+ if (hasBorder ()) {
+ drawFocus (control, false, hasBorder (), getParentBackground (), inset ());
+ } else {
+ drawBackground (control, getParentBackground ());
+ }
}
} else {
if ((state & CANVAS) != 0) {