Mercurial > hg > release > thermostat-1.4
changeset 1845:d06754b2b04f
Make ToggleActionButton act as a plain toggle button by default
Reviewed-by: omajid
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2016-January/017399.html
PR2787
| author | Andrew Azores <aazores@redhat.com> |
|---|---|
| date | Tue, 26 Jan 2016 10:18:13 -0500 |
| parents | 53fa7cb7fe48 |
| children | 842d04b266c6 |
| files | client/swing/src/main/java/com/redhat/thermostat/client/swing/components/ActionToggleButton.java client/swing/src/main/java/com/redhat/thermostat/client/swing/components/ActionToggleButtonUI.java |
| diffstat | 2 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/ActionToggleButton.java Fri Jan 15 11:16:02 2016 -0500 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/ActionToggleButton.java Tue Jan 26 10:18:13 2016 -0500 @@ -45,6 +45,8 @@ @SuppressWarnings("serial") public class ActionToggleButton extends JToggleButton implements ToolbarButton { + + private static final ToggleActionState DEFAULT_TOGGLE_ACTION_STATE = new DefaultToggleActionState(); private String lastText; private boolean showText; @@ -72,6 +74,7 @@ setOpaque(false); setContentAreaFilled(false); setBorder(new ToolbarButtonBorder(this)); + setToggleActionState(DEFAULT_TOGGLE_ACTION_STATE); } @Override @@ -108,5 +111,22 @@ repaint(); } + private static class DefaultToggleActionState implements ToggleActionState { + @Override + public boolean isTransitionState() { + return false; + } + + @Override + public boolean isActionEnabled() { + return false; + } + + @Override + public boolean isButtonEnabled() { + return true; + } + } + }
--- a/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/ActionToggleButtonUI.java Fri Jan 15 11:16:02 2016 -0500 +++ b/client/swing/src/main/java/com/redhat/thermostat/client/swing/components/ActionToggleButtonUI.java Tue Jan 26 10:18:13 2016 -0500 @@ -119,7 +119,7 @@ if (toggleActionState == null) { transitionState = false; actionEnabled = false; - buttonEnabled = false; + buttonEnabled = true; } else { transitionState = toggleActionState.isTransitionState(); actionEnabled = toggleActionState.isActionEnabled();