Author: tchemit Date: 2013-09-24 17:41:41 +0200 (Tue, 24 Sep 2013) New Revision: 2723 Url: http://nuiton.org/projects/jaxx/repository/revisions/2723 Log: fixes #2856: [BeanFilterableComboBox] Editor still open even if editor is disabled Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-09-23 10:19:14 UTC (rev 2722) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-09-24 15:41:41 UTC (rev 2723) @@ -182,7 +182,9 @@ @Override public void mouseClicked(MouseEvent e) { - combobox.showPopup(); + if (ui.isEnabled()) { + combobox.showPopup(); + } } }); @@ -190,7 +192,7 @@ @Override public void keyPressed(KeyEvent e) { - if (!combobox.isPopupVisible()) { + if (ui.isEnabled() && !combobox.isPopupVisible()) { combobox.showPopup(); } }