From a39c5665a6cd98ce87de4075962b1af9dd53aa25 Mon Sep 17 00:00:00 2001 From: Kevin Lamonte Date: Mon, 18 Mar 2019 10:16:25 -0500 Subject: [PATCH] Back to debian stable, fix indent/comments after merge --- build.xml | 9 +++++++-- src/jexer/TButton.java | 45 +++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/build.xml b/build.xml index c212a75..8398701 100644 --- a/build.xml +++ b/build.xml @@ -85,7 +85,13 @@ - + + + diff --git a/src/jexer/TButton.java b/src/jexer/TButton.java index 964035f..33fe733 100644 --- a/src/jexer/TButton.java +++ b/src/jexer/TButton.java @@ -34,7 +34,8 @@ import jexer.bits.GraphicsChars; import jexer.bits.MnemonicString; import jexer.event.TKeypressEvent; import jexer.event.TMouseEvent; -import static jexer.TKeypress.*; +import static jexer.TKeypress.kbEnter; +import static jexer.TKeypress.kbSpace; /** * TButton implements a simple button. To make the button do something, pass @@ -69,10 +70,11 @@ public class TButton extends TWidget { private TAction action; /** - * The background color used for the button "shadow", or NULL for "no shadow". + * The background color used for the button "shadow", or null for "no + * shadow". */ private CellAttributes shadowColor; - + // ------------------------------------------------------------------------ // Constructors ----------------------------------------------------------- // ------------------------------------------------------------------------ @@ -232,19 +234,19 @@ public class TButton extends TWidget { } if (inButtonPress) { - putCharXY(1, 0, ' ', buttonColor); - putStringXY(2, 0, mnemonic.getRawLabel(), buttonColor); + putCharXY(1, 0, ' ', buttonColor); + putStringXY(2, 0, mnemonic.getRawLabel(), buttonColor); putCharXY(getWidth() - 1, 0, ' ', buttonColor); } else { putCharXY(0, 0, ' ', buttonColor); putStringXY(1, 0, mnemonic.getRawLabel(), buttonColor); putCharXY(getWidth() - 2, 0, ' ', buttonColor); - + if (shadowColor != null) { - putCharXY(getWidth() - 1, 0, - GraphicsChars.CP437[0xDC], shadowColor); - hLineXY(1, 1, getWidth() - 1, - GraphicsChars.CP437[0xDF], shadowColor); + putCharXY(getWidth() - 1, 0, + GraphicsChars.CP437[0xDC], shadowColor); + hLineXY(1, 1, getWidth() - 1, + GraphicsChars.CP437[0xDF], shadowColor); } } if (mnemonic.getShortcutIdx() >= 0) { @@ -283,21 +285,20 @@ public class TButton extends TWidget { } /** - * Set the background color used for the button "shadow". - *

- * Can be NULL for "no shadow". + * Set the background color used for the button "shadow". If null, no + * shadow will be drawn. * - * @param color the new background color, or NULL if none + * @param color the new background color, or null for no shadow */ public void setShadowColor(final CellAttributes color) { - if (color != null) { - shadowColor = new CellAttributes(); - shadowColor.setTo(color); - shadowColor.setForeColor(Color.BLACK); - shadowColor.setBold(false); - } else { - shadowColor = null; - } + if (color != null) { + shadowColor = new CellAttributes(); + shadowColor.setTo(color); + shadowColor.setForeColor(Color.BLACK); + shadowColor.setBold(false); + } else { + shadowColor = null; + } } } -- 2.27.0