This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit d08a43287775fdf2fbc0c858bd9823b360839391 Author: Kevin Morin <morin@codelutin.com> Date: Fri Sep 26 14:49:08 2014 +0200 fixes #3520 Enable to set the BeanFilterableComboBox's and BeanComboBox's combobox's maximumRowCount --- .../src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css | 1 + .../src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx | 2 ++ .../main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css | 1 + .../java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx | 2 ++ 4 files changed, 6 insertions(+) diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css index 6451f43..828005b 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.css @@ -73,6 +73,7 @@ enabled:{isEnabled()}; editable:{isEditable()}; focusable:{isEnabled() && isEditable()}; + maximumRowCount: { getMaximumRowCount() != null ? getMaximumRowCount() : 8 }; } #toolbarRight { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx index 4ee74d3..1a1b5cc 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx @@ -69,6 +69,8 @@ <!-- datas of the combo-box --> <java.util.List id='data' genericType='O' javaBean='null'/> + <Integer id="maximumRowCount" javaBean="null"/> + <!-- model of sorted property --> <ButtonGroup id='indexes' onStateChanged='setIndex((Integer)indexes.getSelectedValue())'/> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css index 3a45e13..7c5da67 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.css @@ -73,6 +73,7 @@ enabled:{isEnabled()}; editable:{isEditable()}; focusable:{isEnabled() && isEditable()}; + maximumRowCount: { getMaximumRowCount() != null ? getMaximumRowCount() : 8 }; } #toolbarRight { diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx index d323680..826f73a 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx @@ -72,6 +72,8 @@ <!-- datas of the combo-box --> <java.util.List id='data' genericType='O' javaBean='null'/> + <Integer id="maximumRowCount" javaBean="null"/> + <!-- model of sorted property --> <ButtonGroup id='indexes' onStateChanged='setIndex((Integer)indexes.getSelectedValue())'/> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.