X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjexer%2FTField.java;h=07a457bcf7eb7beb4e05af9e71f8f782a6cc2227;hb=7c870d89433346ccb5505f8f9ba62d3fc18fe996;hp=406c57567bc2871e6c13e1bed93c275ef4b75ce8;hpb=87a17f3ca4b2602c396afdbb13cccb4c1e7cbd38;p=fanfix.git

diff --git a/src/jexer/TField.java b/src/jexer/TField.java
index 406c575..07a457b 100644
--- a/src/jexer/TField.java
+++ b/src/jexer/TField.java
@@ -139,13 +139,9 @@ public class TField extends TWidget {
         final TAction enterAction, final TAction updateAction) {
 
         // Set parent and window
-        super(parent);
-        setX(x);
-        setY(y);
-        setHeight(1);
-        setWidth(width);
-        setHasCursor(true);
+        super(parent, x, y, width, 1);
 
+        setCursorVisible(true);
         this.fixed = fixed;
         this.text = text;
         this.enterAction = enterAction;
@@ -194,7 +190,7 @@ public class TField extends TWidget {
     public void draw() {
         CellAttributes fieldColor;
 
-        if (getAbsoluteActive()) {
+        if (isAbsoluteActive()) {
             fieldColor = getTheme().getColor("tfield.active");
         } else {
             fieldColor = getTheme().getColor("tfield.inactive");
@@ -234,7 +230,7 @@ public class TField extends TWidget {
     public void onMouseDown(final TMouseEvent mouse) {
         this.mouse = mouse;
 
-        if ((mouseOnField()) && (mouse.getMouse1())) {
+        if ((mouseOnField()) && (mouse.isMouse1())) {
             // Move cursor
             int deltaX = mouse.getX() - getCursorX();
             position += deltaX;
@@ -337,16 +333,16 @@ public class TField extends TWidget {
             return;
         }
 
-        if (!keypress.getKey().getIsKey()
-            && !keypress.getKey().getAlt()
-            && !keypress.getKey().getCtrl()
+        if (!keypress.getKey().isFnKey()
+            && !keypress.getKey().isAlt()
+            && !keypress.getKey().isCtrl()
         ) {
             // Plain old keystroke, process it
             if ((position == text.length())
                 && (text.length() < getWidth())) {
 
                 // Append case
-                appendChar(keypress.getKey().getCh());
+                appendChar(keypress.getKey().getChar());
             } else if ((position < text.length())
                 && (text.length() < getWidth())) {
 
@@ -354,12 +350,12 @@ public class TField extends TWidget {
                 if (insertMode == false) {
                     // Replace character
                     text = text.substring(0, position)
-                            + keypress.getKey().getCh()
+                            + keypress.getKey().getChar()
                             + text.substring(position + 1);
                     position++;
                 } else {
                     // Insert character
-                    insertChar(keypress.getKey().getCh());
+                    insertChar(keypress.getKey().getChar());
                 }
             } else if ((position < text.length())
                 && (text.length() >= getWidth())) {
@@ -370,7 +366,7 @@ public class TField extends TWidget {
                 } else if ((fixed == true) && (insertMode == false)) {
                     // Overwrite the last character, maybe move position
                     text = text.substring(0, position)
-                            + keypress.getKey().getCh()
+                            + keypress.getKey().getChar()
                             + text.substring(position + 1);
                     if (position < getWidth() - 1) {
                         position++;
@@ -378,23 +374,23 @@ public class TField extends TWidget {
                 } else if ((fixed == false) && (insertMode == false)) {
                     // Overwrite the last character, definitely move position
                     text = text.substring(0, position)
-                            + keypress.getKey().getCh()
+                            + keypress.getKey().getChar()
                             + text.substring(position + 1);
                     position++;
                 } else {
                     if (position == text.length()) {
                         // Append this character
-                        appendChar(keypress.getKey().getCh());
+                        appendChar(keypress.getKey().getChar());
                     } else {
                         // Insert this character
-                        insertChar(keypress.getKey().getCh());
+                        insertChar(keypress.getKey().getChar());
                     }
                 }
             } else {
                 assert (!fixed);
 
                 // Append this character
-                appendChar(keypress.getKey().getCh());
+                appendChar(keypress.getKey().getChar());
             }
             dispatch(false);
             return;