git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
weblib: set custom covers
[fanfix.git]
/
src
/
jexer
/
TRadioButton.java
diff --git
a/src/jexer/TRadioButton.java
b/src/jexer/TRadioButton.java
index 60a628845ca2c5c920863bd31be7597c95709266..dcc5c13699f03fefceabbc54bf65bac1b6624745 100644
(file)
--- a/
src/jexer/TRadioButton.java
+++ b/
src/jexer/TRadioButton.java
@@
-50,9
+50,9
@@
public class TRadioButton extends TWidget {
// ------------------------------------------------------------------------
/**
// ------------------------------------------------------------------------
/**
- * RadioButton state, true means selected.
+ * RadioButton state, true means selected.
Note package private access.
*/
*/
-
private
boolean selected = false;
+ boolean selected = false;
/**
* The shortcut and radio button label.
/**
* The shortcut and radio button label.
@@
-61,16
+61,16
@@
public class TRadioButton extends TWidget {
/**
* ID for this radio button. Buttons start counting at 1 in the
/**
* ID for this radio button. Buttons start counting at 1 in the
- * RadioGroup.
+ * RadioGroup.
Note package private access.
*/
*/
-
private
int id;
+ int id;
// ------------------------------------------------------------------------
// Constructors -----------------------------------------------------------
// ------------------------------------------------------------------------
/**
// ------------------------------------------------------------------------
// Constructors -----------------------------------------------------------
// ------------------------------------------------------------------------
/**
- * P
ublic
constructor.
+ * P
ackage private
constructor.
*
* @param parent parent widget
* @param x column relative to parent
*
* @param parent parent widget
* @param x column relative to parent
@@
-78,7
+78,7
@@
public class TRadioButton extends TWidget {
* @param label label to display next to (right of) the radiobutton
* @param id ID for this radio button
*/
* @param label label to display next to (right of) the radiobutton
* @param id ID for this radio button
*/
-
public
TRadioButton(final TRadioGroup parent, final int x, final int y,
+ TRadioButton(final TRadioGroup parent, final int x, final int y,
final String label, final int id) {
// Set parent and window
final String label, final int id) {
// Set parent and window
@@
-89,6
+89,8
@@
public class TRadioButton extends TWidget {
setCursorVisible(true);
setCursorX(1);
setCursorVisible(true);
setCursorX(1);
+
+ parent.addRadioButton(this);
}
// ------------------------------------------------------------------------
}
// ------------------------------------------------------------------------
@@
-120,8
+122,7
@@
public class TRadioButton extends TWidget {
public void onMouseDown(final TMouseEvent mouse) {
if ((mouseOnRadioButton(mouse)) && (mouse.isMouse1())) {
// Switch state
public void onMouseDown(final TMouseEvent mouse) {
if ((mouseOnRadioButton(mouse)) && (mouse.isMouse1())) {
// Switch state
- selected = true;
- ((TRadioGroup) getParent()).setSelected(this);
+ ((TRadioGroup) getParent()).setSelected(id);
}
}
}
}
@@
-134,8
+135,7
@@
public class TRadioButton extends TWidget {
public void onKeypress(final TKeypressEvent keypress) {
if (keypress.equals(kbSpace)) {
public void onKeypress(final TKeypressEvent keypress) {
if (keypress.equals(kbSpace)) {
- selected = true;
- ((TRadioGroup) getParent()).setSelected(this);
+ ((TRadioGroup) getParent()).setSelected(id);
return;
}
return;
}
@@
-222,14
+222,17
@@
public class TRadioButton extends TWidget {
}
/**
}
/**
- * Set RadioButton state, true means selected. Note package private
- * access.
+ * Set RadioButton state, true means selected.
*
* @param selected if true then this is the one button in the group that
* is selected
*/
*
* @param selected if true then this is the one button in the group that
* is selected
*/
- void setSelected(final boolean selected) {
- this.selected = selected;
+ public void setSelected(final boolean selected) {
+ if (selected == true) {
+ ((TRadioGroup) getParent()).setSelected(id);
+ } else {
+ ((TRadioGroup) getParent()).setSelected(0);
+ }
}
/**
}
/**