X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTComboBox.java;h=b64dbde058ad006d4a5d80fd83e9ddd4303e8ba2;hb=b73fc652a8bae52fb3cf653d628cf749dce20324;hp=bb223c3a12aa4b6b3340bdaf544858a6025fde25;hpb=a69ed767c9c07cf35cf1c5f7821fc009cfe79cd2;p=fanfix.git diff --git a/src/jexer/TComboBox.java b/src/jexer/TComboBox.java index bb223c3..b64dbde 100644 --- a/src/jexer/TComboBox.java +++ b/src/jexer/TComboBox.java @@ -66,6 +66,11 @@ public class TComboBox extends TWidget { */ private boolean limitToListValue = true; + /** + * The maximum height of the values drop-down when it is visible. + */ + private int maxValuesHeight = 3; + // ------------------------------------------------------------------------ // Constructors ----------------------------------------------------------- // ------------------------------------------------------------------------ @@ -80,14 +85,14 @@ public class TComboBox extends TWidget { * @param values the possible values for the box, shown in the drop-down * @param valuesIndex the initial index in values, or -1 for no default * value - * @param valuesHeight the height of the values drop-down when it is - * visible + * @param maxValuesHeight the maximum height of the values drop-down when + * it is visible * @param updateAction action to call when a new value is selected from * the list or enter is pressed in the edit field */ public TComboBox(final TWidget parent, final int x, final int y, final int width, final List values, final int valuesIndex, - final int valuesHeight, final TAction updateAction) { + final int maxValuesHeight, final TAction updateAction) { // Set parent and window super(parent, x, y, width, 1); @@ -95,25 +100,26 @@ public class TComboBox extends TWidget { assert (values != null); this.updateAction = updateAction; + this.maxValuesHeight = maxValuesHeight; - field = new TField(this, 0, 0, width - 3, false, "", - updateAction, null); - if (valuesIndex >= 0) { + field = addField(0, 0, width - 3, false, "", updateAction, null); + if ((valuesIndex >= 0) && (valuesIndex < values.size())) { field.setText(values.get(valuesIndex)); } - list = new TList(this, values, 0, 1, width, valuesHeight, + list = addList(values, 0, 1, width, + Math.max(3, Math.min(values.size() + 1, maxValuesHeight)), new TAction() { public void DO() { field.setText(list.getSelected()); list.setEnabled(false); list.setVisible(false); - TComboBox.this.setHeight(1); + TComboBox.super.setHeight(1); if (TComboBox.this.limitToListValue == false) { TComboBox.this.activate(field); } if (updateAction != null) { - updateAction.DO(); + updateAction.DO(TComboBox.this); } } } @@ -124,7 +130,7 @@ public class TComboBox extends TWidget { list.setEnabled(false); list.setVisible(false); - setHeight(1); + super.setHeight(1); if (limitToListValue) { field.setEnabled(false); } else { @@ -162,17 +168,9 @@ public class TComboBox extends TWidget { if ((mouseOnArrow(mouse)) && (mouse.isMouse1())) { // Make the list visible or not. if (list.isActive()) { - list.setEnabled(false); - list.setVisible(false); - setHeight(1); - if (limitToListValue == false) { - activate(field); - } + hideList(); } else { - list.setEnabled(true); - list.setVisible(true); - setHeight(list.getHeight() + 1); - activate(list); + showList(); } } @@ -189,21 +187,13 @@ public class TComboBox extends TWidget { public void onKeypress(final TKeypressEvent keypress) { if (keypress.equals(kbEsc)) { if (list.isActive()) { - list.setEnabled(false); - list.setVisible(false); - setHeight(1); - if (limitToListValue == false) { - activate(field); - } + hideList(); return; } } if (keypress.equals(kbAltDown)) { - list.setEnabled(true); - list.setVisible(true); - setHeight(list.getHeight() + 1); - activate(list); + showList(); return; } @@ -212,12 +202,7 @@ public class TComboBox extends TWidget { || (keypress.equals(kbBackTab)) ) { if (list.isActive()) { - list.setEnabled(false); - list.setVisible(false); - setHeight(1); - if (limitToListValue == false) { - activate(field); - } + hideList(); return; } } @@ -230,6 +215,33 @@ public class TComboBox extends TWidget { // TWidget ---------------------------------------------------------------- // ------------------------------------------------------------------------ + /** + * Override TWidget's width: we need to set child widget widths. + * + * @param width new widget width + */ + @Override + public void setWidth(final int width) { + if (field != null) { + field.setWidth(width - 3); + } + if (list != null) { + list.setWidth(width); + } + super.setWidth(width); + } + + /** + * Override TWidget's height: we can only set height at construction + * time. + * + * @param height new widget height (ignored) + */ + @Override + public void setHeight(final int height) { + // Do nothing + } + /** * Draw the combobox down arrow. */ @@ -240,16 +252,11 @@ public class TComboBox extends TWidget { if (!isAbsoluteActive()) { // We lost focus, turn off the list. if (list.isActive()) { - list.setEnabled(false); - list.setVisible(false); - setHeight(1); - if (limitToListValue == false) { - activate(field); - } + hideList(); } } - if (isAbsoluteActive() && (limitToListValue == false)) { + if (isAbsoluteActive()) { comboBoxColor = getTheme().getColor("tcombobox.active"); } else { comboBoxColor = getTheme().getColor("tcombobox.inactive"); @@ -267,6 +274,28 @@ public class TComboBox extends TWidget { // TComboBox -------------------------------------------------------------- // ------------------------------------------------------------------------ + /** + * Hide the drop-down list. + */ + public void hideList() { + list.setEnabled(false); + list.setVisible(false); + super.setHeight(1); + if (limitToListValue == false) { + activate(field); + } + } + + /** + * Show the drop-down list. + */ + public void showList() { + list.setEnabled(true); + list.setVisible(true); + super.setHeight(list.getHeight() + 1); + activate(list); + } + /** * Get combobox text value. * @@ -282,11 +311,29 @@ public class TComboBox extends TWidget { * @param text the new text in the edit field */ public void setText(final String text) { + setText(text, true); + } + + /** + * Set combobox text value. + * + * @param text the new text in the edit field + * @param caseSensitive if true, perform a case-sensitive search for the + * list item + */ + public void setText(final String text, final boolean caseSensitive) { field.setText(text); for (int i = 0; i < list.getMaxSelectedIndex(); i++) { - if (list.getSelected().equals(text)) { - list.setSelectedIndex(i); - return; + if (caseSensitive == true) { + if (list.getListItem(i).equals(text)) { + list.setSelectedIndex(i); + return; + } + } else { + if (list.getListItem(i).toLowerCase().equals(text.toLowerCase())) { + list.setSelectedIndex(i); + return; + } } } list.setSelectedIndex(-1); @@ -318,6 +365,8 @@ public class TComboBox extends TWidget { */ public final void setList(final List list) { this.list.setList(list); + this.list.setHeight(Math.max(3, Math.min(list.size() + 1, + maxValuesHeight))); field.setText(""); }