Author: tchemit Date: 2014-05-14 16:16:39 +0200 (Wed, 14 May 2014) New Revision: 2830 Url: http://forge.nuiton.org/projects/jaxx/repository/revisions/2830 Log: fixes #3198: Permits to not auto acquire focus in Bean combobox Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 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/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2014-05-14 12:47:00 UTC (rev 2829) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2014-05-14 14:16:39 UTC (rev 2830) @@ -25,7 +25,7 @@ <Table fill='both' insets='0' genericType='O' implements='jaxx.runtime.bean.BeanTypeAware<O>' - onFocusGained='combobox.requestFocus()' onFocusLost='hidePopup()'> + onFocusGained='handler.focusCombo()' onFocusLost='hidePopup()'> <import> jaxx.runtime.swing.model.JaxxDefaultComboBoxModel @@ -54,6 +54,9 @@ <!-- sortable combo property --> <Boolean id='sortable' javaBean='true'/> + <!-- to transmit focus from table to combo property --> + <Boolean id='autoFocus' javaBean='true'/> + <!-- bean property linked state --> <String id='property' javaBean='""'/> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2014-05-14 12:47:00 UTC (rev 2829) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2014-05-14 14:16:39 UTC (rev 2830) @@ -316,6 +316,17 @@ } /** + * Focus combo only if autoFocus ui property is on. + * + * @since 2.8.5 + */ + public void focusCombo() { + if (ui.isAutoFocus()) { + ui.combobox.requestFocusInWindow(); + } + } + + /** * Modifie l'état autoComplete de l'ui. * * @param oldValue l'ancienne valeur Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2014-05-14 12:47:00 UTC (rev 2829) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2014-05-14 14:16:39 UTC (rev 2830) @@ -25,7 +25,7 @@ <Table fill='both' insets='0' genericType='O' implements='jaxx.runtime.bean.BeanTypeAware<O>' - onFocusGained='combobox.requestFocus()' onFocusLost='hidePopup()'> + onFocusGained='handler.focusCombo()' onFocusLost='hidePopup()'> <import> jaxx.runtime.swing.model.JaxxFilterableComboBoxModel @@ -54,6 +54,9 @@ <!-- sortable combo property --> <Boolean id='sortable' javaBean='true'/> + <!-- to transmit focus from table to combo property --> + <Boolean id='autoFocus' javaBean='true'/> + <!-- to select using enter key when there is only one selection --> <Boolean id='enterToSelectUniqueUniverse' javaBean='true'/> 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 2014-05-14 12:47:00 UTC (rev 2829) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2014-05-14 14:16:39 UTC (rev 2830) @@ -441,6 +441,17 @@ } /** + * Focus combo only if autoFocus ui property is on. + * + * @since 2.8.5 + */ + public void focusCombo() { + if (ui.isAutoFocus()) { + ui.combobox.requestFocusInWindow(); + } + } + + /** * Modifie l'état filterable de l'ui. * * @param oldValue l'ancienne valeur