Merge pull request #558 from eclipse/bugfix/Issue_499_TableComboViewe…

…r_dropdown_not_closed_automatically_on_mouse_click_on_the_dialog_area Bug #499 - TableComboViewer dropdown not closed automatically
EclipseNebula · Jan 25, 2024 · 18d650e · 18d650e
2 parents 3b70c39 + fd962d9
commit 18d650e
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...lipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java b/...lipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java
@@ -584,7 +584,11 @@ private void comboEvent(final Event event) {
 			if (focusControl == arrow || focusControl == table) {
 				return;
 			}
-			if (!isDropped()) {
+			if (isDropped()) {
+				if (isWindows()) {
+					table.setFocus();
+				}
+			} else {
 				text.setFocus();
 			}
 			break;
@@ -597,6 +601,10 @@ private void comboEvent(final Event event) {
 		}
 	}
 
+	private boolean isWindows() {
+		return System.getProperty("os.name").indexOf("indows") != -1;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */