Skip to content

Fixing reseting of bar when visibility is toggled. #5809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svenviktorm wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fixing reseting of bar when visibility is toggled. #5809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68c0cf4
Separated the value and visibility in the token bar
svenviktorm Oct 7, 2025
2197cbe
Ran spotlessApply
svenviktorm Oct 7, 2025
8fde94b
Updated UI for Bar Sliders
svenviktorm Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 47 additions & 3 deletions src/main/java/net/rptools/maptool/client/functions/TokenBarFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ private TokenBarFunction() {
/** singleton instance of this function */
private static final TokenBarFunction instance = new TokenBarFunction();

/** Suffix added to the bar name to store the hidden value of the bar */
public static final String hidenBarSuffix = "StoredValue";

/**
* @return singleton instance
*/
Expand Down Expand Up @@ -84,7 +87,10 @@ public Object childEvaluate(
* @return A {@link BigDecimal} value, or an empty string "" if bar is not visible
*/
public static Object getValue(Token token, String bar) {
Object value = token.getState(bar);
Object value = token.getState(bar + hidenBarSuffix);
if (value == null) {
value = token.getState(bar);
}
return value != null ? value : "";
}

Expand All @@ -95,8 +101,19 @@ public static Object getValue(Token token, String bar) {
* @return The {@link BigDecimal} value that was actually set.
*/
public static Object setValue(Token token, String bar, Object value) {
Object valueShown = token.getState(bar);
BigDecimal val = getBigDecimalValue(value);
MapTool.serverCommand().updateTokenProperty(token, Token.Update.setState, bar, val);
if (valueShown != null) {
// If the bar is visible, set both the visual value of the bar and the stored value
MapTool.serverCommand().updateTokenProperty(token, Token.Update.setState, bar, val);
MapTool.serverCommand()
.updateTokenProperty(token, Token.Update.setState, bar + hidenBarSuffix, val);
} else {
// If the bar is not visible, only set the stored value
MapTool.serverCommand()
.updateTokenProperty(token, Token.Update.setState, bar + hidenBarSuffix, val);
}

return val;
}

Expand All @@ -116,7 +133,34 @@ public static BigDecimal isVisible(Token token, String bar) {
* @return If the bar visible or not
*/
public static BigDecimal setVisible(Token token, String bar, boolean show) {
MapTool.serverCommand().updateTokenProperty(token, Token.Update.setState, bar, show);
Object valueShown = token.getState(bar);
Object valueHidden = token.getState(bar + hidenBarSuffix);
if (show) {
if (valueHidden != null) {
// if we want to show the bar, and we have a hidden value, restore it
MapTool.serverCommand()
.updateTokenProperty(
token, Token.Update.setState, bar, getBigDecimalValue(valueHidden));
} else {
if (valueShown == null) {
// if we want to show the bar, and we don't have a hidden value, and no shown value, set
// both to true/1.0
// This check is to avoid messing with old tokens that does not have a hidden value.
MapTool.serverCommand().updateTokenProperty(token, Token.Update.setState, bar, true);
MapTool.serverCommand()
.updateTokenProperty(token, Token.Update.setState, bar + hidenBarSuffix, true);
}
}
} else {
if (valueShown != null) {
// if we want to hide the bar, and we have a shown value, store it and hide the bar
MapTool.serverCommand()
.updateTokenProperty(
token, Token.Update.setState, bar + hidenBarSuffix, getBigDecimalValue(valueShown));
MapTool.serverCommand().updateTokenProperty(token, Token.Update.setState, bar, false);
}
}

return show ? BigDecimal.ONE : BigDecimal.ZERO;
}

Expand Down
22 changes: 17 additions & 5 deletions src/main/java/net/rptools/maptool/client/ui/TokenPopupMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,14 +691,23 @@ public void actionPerformed(ActionEvent e) {
hide.setSelected(true);
slider.setEnabled(false);
slider.setValue(100);
Object hiddenValue = getTokenUnderMouse().getState(name + TokenBarFunction.hidenBarSuffix);
if (hiddenValue != null) {
slider.setValue(
(int) (TokenBarFunction.getBigDecimalValue(hiddenValue).doubleValue() * 100));
} else {
slider.setValue(100);
}
} else {
hide.setSelected(false);
slider.setEnabled(true);
slider.setValue(
(int)
(TokenBarFunction.getBigDecimalValue(getTokenUnderMouse().getState(name))
.doubleValue()
* 100));
Object hiddenValue = getTokenUnderMouse().getState(name + TokenBarFunction.hidenBarSuffix);
if (hiddenValue != null) {
slider.setValue(
(int) (TokenBarFunction.getBigDecimalValue(hiddenValue).doubleValue() * 100));
} else {
slider.setValue(100);
}
}

JPanel barPanel = new JPanel(new MigLayout("wrap 2"));
Expand All @@ -721,6 +730,9 @@ public void actionPerformed(ActionEvent e) {
Token token = zone.getToken(tokenGUID);
BigDecimal val = hide.isSelected() ? null : new BigDecimal(slider.getValue() / 100.0);
token.setState(name, val);
if (val != null) {
token.setState(name + TokenBarFunction.hidenBarSuffix, val);
}
MapTool.serverCommand().putToken(zone.getId(), token);
}
}
Expand Down
17 changes: 15 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenBarController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import net.rptools.lib.MD5Key;
import net.rptools.maptool.client.AppConstants;
import net.rptools.maptool.client.AppPreferences;
import net.rptools.maptool.client.functions.TokenBarFunction;
import net.rptools.maptool.client.swing.AbeillePanel;
import net.rptools.maptool.client.swing.ColorWell;
import net.rptools.maptool.client.ui.PreviewPanelFileChooser;
Expand Down Expand Up @@ -530,8 +531,20 @@ public void changedUpdate(DocumentEvent e) {
boolean hasImages = false;
BarTokenOverlay selectedBar = (BarTokenOverlay) formPanel.getList(BARS).getSelectedValue();
boolean hasUniqueUpdateName = false;
var namesToCheck = new ArrayList<String>();
// We need to check for both the name and the name with the hidden value suffix
if (selectedBar != null) {
for (String name : getNames()) {
namesToCheck.add(name + TokenBarFunction.hidenBarSuffix);
namesToCheck.add(name);
if (name.endsWith(TokenBarFunction.hidenBarSuffix)) {
namesToCheck.add(
name.substring(0, name.length() - TokenBarFunction.hidenBarSuffix.length()));
}
}
}
if (selectedBar != null)
hasUniqueUpdateName = selectedBar.getName().equals(text) || !getNames().contains(text);
hasUniqueUpdateName = selectedBar.getName().equals(text) || !namesToCheck.contains(text);
if (size > 0 && imageCount == size) {
hasImages = true;
} else if (size < 0 && imageCount == increments && increments > 0) {
Expand All @@ -541,7 +554,7 @@ public void changedUpdate(DocumentEvent e) {
} // endif
formPanel
.getButton(ADD)
.setEnabled(hasName && !getNames().contains(text) && hasImages && hasShow);
.setEnabled(hasName && !namesToCheck.contains(text) && hasImages && hasShow);
formPanel
.getButton(UPDATE)
.setEnabled(hasName && hasUniqueUpdateName && selectedBar != null && hasShow && hasImages);
Expand Down
17 changes: 15 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenStatesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import net.rptools.lib.StringUtil;
import net.rptools.maptool.client.AppConstants;
import net.rptools.maptool.client.AppPreferences;
import net.rptools.maptool.client.functions.TokenBarFunction;
import net.rptools.maptool.client.swing.AbeillePanel;
import net.rptools.maptool.client.swing.ColorWell;
import net.rptools.maptool.client.ui.PreviewPanelFileChooser;
Expand Down Expand Up @@ -454,12 +455,24 @@ public void changedUpdate(DocumentEvent e) {
|| formPanel.getCheckBox(SHOW_OTHERS).isSelected();
BooleanTokenOverlay selectedState =
(BooleanTokenOverlay) formPanel.getList(STATES).getSelectedValue();
var namesToCheck = new ArrayList<String>();
// We need to check for both the name and the name with the hidden value suffix
if (selectedState != null) {
for (String name : getNames()) {
namesToCheck.add(name + TokenBarFunction.hidenBarSuffix);
namesToCheck.add(name);
if (name.endsWith(TokenBarFunction.hidenBarSuffix)) {
namesToCheck.add(
name.substring(0, name.length() - TokenBarFunction.hidenBarSuffix.length()));
}
}
}
boolean hasUniqueUpdateName = false;
if (selectedState != null)
hasUniqueUpdateName = selectedState.getName().equals(text) || !getNames().contains(text);
hasUniqueUpdateName = selectedState.getName().equals(text) || !namesToCheck.contains(text);
formPanel
.getButton(ADD)
.setEnabled(hasName && !getNames().contains(text) && hasImage && hasShow);
.setEnabled(hasName && !namesToCheck.contains(text) && hasImage && hasShow);
formPanel
.getButton(UPDATE)
.setEnabled(hasName && hasUniqueUpdateName && selectedState != null && hasShow);
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,13 @@ public void bind(final Token token) {
if (token.getState(bar.getName()) == null) {
cb.setSelected(true);
bar.setEnabled(false);
bar.setValue(100);
Object hiddenValue = token.getState(bar.getName() + TokenBarFunction.hidenBarSuffix);
if (hiddenValue != null) {
bar.setValue(
(int) (TokenBarFunction.getBigDecimalValue(hiddenValue).doubleValue() * 100));
} else {
bar.setValue(100);
}
} else {
cb.setSelected(false);
bar.setEnabled(true);
Expand Down Expand Up @@ -878,6 +884,9 @@ public boolean commit() {
BigDecimal value =
cb.isSelected() ? null : new BigDecimal(bar.getValue()).divide(new BigDecimal(100));
token.setState(bar.getName(), value);
if (value != null) {
token.setState(bar.getName() + TokenBarFunction.hidenBarSuffix, value);
}
bar.setValue(
(int)
(TokenBarFunction.getBigDecimalValue(token.getState(bar.getName())).doubleValue()
Expand Down