X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTCheckbox.java;h=86933a73afd147519393c98757abe027929f6760;hb=43ad7b6c509c45c8f261e77ea059c10fed8c9f1c;hp=939f3fed0272ccd9905ffd8f9c3bf24db53764ee;hpb=00d2622b0fff2411dc81ee2a0cc43a5f3f52564c;p=fanfix.git

diff --git a/src/jexer/TCheckbox.java b/src/jexer/TCheckbox.java
index 939f3fe..86933a7 100644
--- a/src/jexer/TCheckbox.java
+++ b/src/jexer/TCheckbox.java
@@ -1,46 +1,48 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
- * License: LGPLv3 or later
- *
- * This module is licensed under the GNU Lesser General Public License
- * Version 3.  Please see the file "COPYING" in this directory for more
- * information about the GNU Lesser General Public License Version 3.
+ * The MIT License (MIT)
  *
- *     Copyright (C) 2015  Kevin Lamonte
+ * Copyright (C) 2017 Kevin Lamonte
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see
- * http://www.gnu.org/licenses/, or write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * @author Kevin Lamonte [kevin.lamonte@gmail.com]
  * @version 1
  */
 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.
  */
 public final class TCheckbox extends TWidget {
 
+    // ------------------------------------------------------------------------
+    // Variables --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Checkbox state, true means checked.
      */
@@ -51,6 +53,10 @@ public final class TCheckbox extends TWidget {
      */
     private String label;
 
+    // ------------------------------------------------------------------------
+    // Constructors -----------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Public constructor.
      *
@@ -64,19 +70,19 @@ public final class TCheckbox extends TWidget {
         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);
     }
 
+    // ------------------------------------------------------------------------
+    // Event handlers ---------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Returns true if the mouse is currently on the checkbox.
      *
@@ -93,6 +99,39 @@ public final class TCheckbox extends TWidget {
         return false;
     }
 
+    /**
+     * Handle mouse checkbox presses.
+     *
+     * @param mouse mouse button down event
+     */
+    @Override
+    public void onMouseDown(final TMouseEvent mouse) {
+        if ((mouseOnCheckbox(mouse)) && (mouse.isMouse1())) {
+            // Switch state
+            checked = !checked;
+        }
+    }
+
+    /**
+     * Handle keystrokes.
+     *
+     * @param keypress keystroke event
+     */
+    @Override
+    public void onKeypress(final TKeypressEvent keypress) {
+        if (keypress.equals(kbSpace)) {
+            checked = !checked;
+            return;
+        }
+
+        // Pass to parent for the things we don't care about.
+        super.onKeypress(keypress);
+    }
+
+    // ------------------------------------------------------------------------
+    // TWidget ----------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Draw a checkbox with label.
      */
@@ -100,7 +139,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");
@@ -113,36 +152,29 @@ 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);
     }
 
+    // ------------------------------------------------------------------------
+    // TCheckbox --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
-     * Handle mouse checkbox presses.
+     * Get checked value.
      *
-     * @param mouse mouse button down event
+     * @return if true, this is checked
      */
-    @Override
-    public void onMouseDown(final TMouseEvent mouse) {
-        if ((mouseOnCheckbox(mouse)) && (mouse.getMouse1())) {
-            // Switch state
-            checked = !checked;
-        }
+    public boolean isChecked() {
+        return checked;
     }
 
     /**
-     * Handle keystrokes.
+     * Set checked value.
      *
-     * @param keypress keystroke event
+     * @param checked new checked value.
      */
-    @Override
-    public void onKeypress(final TKeypressEvent keypress) {
-        if (keypress.equals(kbSpace)) {
-            checked = !checked;
-            return;
-        }
-
-        // Pass to parent for the things we don't care about.
-        super.onKeypress(keypress);
+    public void setChecked(final boolean checked) {
+        this.checked = checked;
     }
 
 }