summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDuong Nguyen <dnguyen>2008-08-26 21:13:59 +0000
committerDuong Nguyen <dnguyen>2008-08-26 21:13:59 +0000
commit44d6b226277dcaf683be1a1e10e4195fe459dfd9 (patch)
tree5449f4af13e8af53b6acbbb06a3c44432402d3f6
parent3d1253cbd7eb819e01f7e0bed0c2edeb578c461c (diff)
downloadeclipse.platform.swt-44d6b226277dcaf683be1a1e10e4195fe459dfd9.tar.gz
eclipse.platform.swt-44d6b226277dcaf683be1a1e10e4195fe459dfd9.tar.xz
eclipse.platform.swt-44d6b226277dcaf683be1a1e10e4195fe459dfd9.zip
Bug 236634 - Cannot dismiss attribute type combo
- back port for 3.4.1
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
index abf39753de..beb2e06853 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
@@ -494,7 +494,7 @@ public void deselectAll () {
list.deselectAll ();
}
void dropDown (boolean drop) {
- if (drop == isDropped () || !isVisible()) return;
+ if (drop == isDropped ()) return;
if (!drop) {
popup.setVisible (false);
if (!isDisposed () && isFocusControl()) {
@@ -502,7 +502,7 @@ void dropDown (boolean drop) {
}
return;
}
-
+ if (!isVisible()) return;
if (getShell() != popup.getParent ()) {
String[] items = list.getItems ();
int selectionIndex = list.getSelectionIndex ();