git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b972491
)
tbutton: allow empty shadow colour
author
Niki Roo
<niki@nikiroo.be>
Wed, 13 Mar 2019 07:49:55 +0000
(08:49 +0100)
committer
Niki Roo
<niki@nikiroo.be>
Wed, 13 Mar 2019 07:49:55 +0000
(08:49 +0100)
src/jexer/TButton.java
patch
|
blob
|
blame
|
history
diff --git
a/src/jexer/TButton.java
b/src/jexer/TButton.java
index 83ff2d241f0c1c31dc27b45c65285c346f87b417..964035fc5a0ee47241aed898cb59c63c5354746d 100644
(file)
--- a/
src/jexer/TButton.java
+++ b/
src/jexer/TButton.java
@@
-69,10
+69,10
@@
public class TButton extends TWidget {
private TAction action;
/**
private TAction action;
/**
- * The background color used for the button "shadow".
+ * The background color used for the button "shadow"
, or NULL for "no shadow"
.
*/
private CellAttributes shadowColor;
*/
private CellAttributes shadowColor;
-
+
// ------------------------------------------------------------------------
// Constructors -----------------------------------------------------------
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
// Constructors -----------------------------------------------------------
// ------------------------------------------------------------------------
@@
-232,18
+232,20
@@
public class TButton extends TWidget {
}
if (inButtonPress) {
}
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);
putCharXY(getWidth() - 1, 0, ' ', buttonColor);
} else {
putCharXY(0, 0, ' ', buttonColor);
putStringXY(1, 0, mnemonic.getRawLabel(), buttonColor);
putCharXY(getWidth() - 2, 0, ' ', buttonColor);
-
- putCharXY(getWidth() - 1, 0,
- GraphicsChars.CP437[0xDC], shadowColor);
- hLineXY(1, 1, getWidth() - 1,
- GraphicsChars.CP437[0xDF], shadowColor);
+
+ if (shadowColor != null) {
+ putCharXY(getWidth() - 1, 0,
+ GraphicsChars.CP437[0xDC], shadowColor);
+ hLineXY(1, 1, getWidth() - 1,
+ GraphicsChars.CP437[0xDF], shadowColor);
+ }
}
if (mnemonic.getShortcutIdx() >= 0) {
if (inButtonPress) {
}
if (mnemonic.getShortcutIdx() >= 0) {
if (inButtonPress) {
@@
-282,14
+284,20
@@
public class TButton extends TWidget {
/**
* Set the background color used for the button "shadow".
/**
* Set the background color used for the button "shadow".
+ * <p>
+ * Can be NULL for "no shadow".
*
*
- * @param color the new background color
+ * @param color the new background color
, or NULL if none
*/
public void setShadowColor(final CellAttributes color) {
*/
public void setShadowColor(final CellAttributes color) {
- shadowColor = new CellAttributes();
- shadowColor.setTo(color);
- shadowColor.setForeColor(Color.BLACK);
- shadowColor.setBold(false);
+ if (color != null) {
+ shadowColor = new CellAttributes();
+ shadowColor.setTo(color);
+ shadowColor.setForeColor(Color.BLACK);
+ shadowColor.setBold(false);
+ } else {
+ shadowColor = null;
+ }
}
}
}
}