X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTVScroller.java;h=42a505e45257706532e19c81005fc1b425c7827c;hb=e16dda65585466c8987bd1efd718431450a96605;hp=459ef4fbe25986af4984cca3284eef368ad47ea9;hpb=cc99cba8bdfb594d4606949f1763898a420e7f34;p=nikiroo-utils.git

diff --git a/src/jexer/TVScroller.java b/src/jexer/TVScroller.java
index 459ef4f..42a505e 100644
--- a/src/jexer/TVScroller.java
+++ b/src/jexer/TVScroller.java
@@ -1,29 +1,27 @@
-/**
+/*
  * 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) 2016 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
@@ -152,24 +150,19 @@ public final class TVScroller extends TWidget {
      * @param parent parent widget
      * @param x column relative to parent
      * @param y row relative to parent
-     * @param width height of scroll bar
+     * @param height height of scroll bar
      */
     public TVScroller(final TWidget parent, final int x, final int y,
         final int height) {
 
         // Set parent and window
-        super(parent);
-
-        setX(x);
-        setY(y);
-        setHeight(height);
-        setWidth(1);
+        super(parent, x, y, 1, height);
     }
 
     /**
      * Compute the position of the scroll box (a.k.a. grip, thumb).
      *
-     * @param Y position of the box, between 1 and height - 2
+     * @return Y position of the box, between 1 and height - 2
      */
     private int boxPosition() {
         return (getHeight() - 3) * (value - topValue) / (bottomValue - topValue) + 1;
@@ -333,13 +326,14 @@ public final class TVScroller extends TWidget {
             return;
         }
 
-        if ((mouse.getMouse1()) &&
-            (inScroll) &&
-            (mouse.getY() > 0) &&
-            (mouse.getY() < getHeight() - 1)
+        if ((mouse.isMouse1())
+            && (inScroll)
+            && (mouse.getY() > 0)
+            && (mouse.getY() < getHeight() - 1)
         ) {
             // Recompute value based on new box position
-            value = (bottomValue - topValue) * (mouse.getY()) / (getHeight() - 3) + topValue;
+            value = (bottomValue - topValue)
+                * (mouse.getY()) / (getHeight() - 3) + topValue;
             return;
         }