X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTCheckbox.java;h=e15a47f8f8e7795f133cd3e2a7c29ec45a78c801;hb=0d47c5460c8e9d1198928308767a63ad35f46eb8;hp=556a11bec8e3965291ca4f2398062a46d8b208c6;hpb=7272e49f35db74caa16eead38aa39a80bb9fc641;p=fanfix.git

diff --git a/src/jexer/TCheckbox.java b/src/jexer/TCheckbox.java
index 556a11b..e15a47f 100644
--- a/src/jexer/TCheckbox.java
+++ b/src/jexer/TCheckbox.java
@@ -30,11 +30,11 @@
  */
 package jexer;
 
+import static jexer.TKeypress.kbSpace;
 import jexer.bits.CellAttributes;
 import jexer.bits.GraphicsChars;
 import jexer.event.TKeypressEvent;
 import jexer.event.TMouseEvent;
-import static jexer.TKeypress.*;
 
 /**
  * TCheckbox implements an on/off checkbox.
@@ -46,6 +46,24 @@ public final class TCheckbox extends TWidget {
      */
     private boolean checked = false;
 
+    /**
+     * Get checked value.
+     *
+     * @return if true, this is checked
+     */
+    public final boolean isChecked() {
+        return checked;
+    }
+
+    /**
+     * Set checked value.
+     *
+     * @param checked new checked value.
+     */
+    public final void setChecked(final boolean checked) {
+        this.checked = checked;
+    }
+
     /**
      * Label for this checkbox.
      */
@@ -61,19 +79,15 @@ public final class TCheckbox extends TWidget {
      * @param checked initial check state
      */
     public TCheckbox(final TWidget parent, final int x, final int y,
-        final String label, final boolean checked) {
+            final String label, final boolean checked) {
 
         // Set parent and window
-        super(parent);
+        super(parent, x, y, label.length() + 4, 1);
 
-        setX(x);
-        setY(y);
-        setHeight(1);
         this.label = label;
-        setWidth(label.length() + 4);
         this.checked = checked;
 
-        setHasCursor(true);
+        setCursorVisible(true);
         setCursorX(1);
     }
 
@@ -84,11 +98,10 @@ public final class TCheckbox extends TWidget {
      * @return true if the mouse is currently on the checkbox
      */
     private boolean mouseOnCheckbox(final TMouseEvent mouse) {
-        if ((mouse != null)
-            && (mouse.getY() == 0)
-            && (mouse.getX() >= 0)
-            && (mouse.getX() <= 2)
-        ) {
+        if ((mouse.getY() == 0)
+                && (mouse.getX() >= 0)
+                && (mouse.getX() <= 2)
+                ) {
             return true;
         }
         return false;
@@ -101,7 +114,7 @@ public final class TCheckbox extends TWidget {
     public void draw() {
         CellAttributes checkboxColor;
 
-        if (getAbsoluteActive()) {
+        if (isAbsoluteActive()) {
             checkboxColor = getTheme().getColor("tcheckbox.active");
         } else {
             checkboxColor = getTheme().getColor("tcheckbox.inactive");
@@ -114,7 +127,7 @@ public final class TCheckbox extends TWidget {
             getScreen().putCharXY(1, 0, ' ', checkboxColor);
         }
         getScreen().putCharXY(2, 0, ']', checkboxColor);
-        getScreen().putStrXY(4, 0, label, checkboxColor);
+        getScreen().putStringXY(4, 0, label, checkboxColor);
     }
 
     /**
@@ -124,7 +137,7 @@ public final class TCheckbox extends TWidget {
      */
     @Override
     public void onMouseDown(final TMouseEvent mouse) {
-        if ((mouseOnCheckbox(mouse)) && (mouse.getMouse1())) {
+        if ((mouseOnCheckbox(mouse)) && (mouse.isMouse1())) {
             // Switch state
             checked = !checked;
         }