Jmr3366 - FR RPTools#1386 to allow opacity to be set at 0

Jmr3366 · Apr 13, 2023 · 79ee651 · 79ee651
1 parent a035827
commit 79ee651
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form
@@ -884,7 +884,7 @@
                 </constraints>
                 <properties>
                   <majorTickSpacing value="10"/>
-                  <minimum value="5"/>
+                  <minimum value="0"/>
                   <minorTickSpacing value="5"/>
                   <name value="tokenOpacitySlider"/>
                   <orientation value="1"/>

diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.java b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.java
@@ -453,7 +453,7 @@ public class TokenPropertiesDialog {
         panel11.add(spacer8, new GridConstraints(0, 9, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
         final JSlider slider1 = new JSlider();
         slider1.setMajorTickSpacing(10);
-        slider1.setMinimum(5);
+        slider1.setMinimum(0);
         slider1.setMinorTickSpacing(5);
         slider1.setName("tokenOpacitySlider");
         slider1.setOrientation(1);

diff --git a/src/main/java/net/rptools/maptool/model/Token.java b/src/main/java/net/rptools/maptool/model/Token.java
@@ -674,7 +674,7 @@ public Color getHaloColor() {
   }
 
   public float getTokenOpacity() {
-    if (tokenOpacity <= 0.0f) {
+    if (tokenOpacity < 0.0f) {
       tokenOpacity = 1.0f;
     }
 
@@ -701,8 +701,8 @@ public float setTokenOpacity(float alpha) {
     if (alpha > 1.0f) {
       alpha = 1.0f;
     }
-    if (alpha <= 0.0f) {
-      alpha = 0.05f;
+    if (alpha < 0.0f) {
+      alpha = 0.0f;
     }
 
     tokenOpacity = alpha;

diff --git a/src/main/resources/net/rptools/maptool/client/ui/forms/tokenPropertiesDialog.xml b/src/main/resources/net/rptools/maptool/client/ui/forms/tokenPropertiesDialog.xml
@@ -4981,7 +4981,7 @@
                                    <at name="width">29</at>
                                    <at name="majorTickSpacing">20</at>
                                    <at name="minorTickSpacing">5</at>
-                                   <at name="minimum">5</at>
+                                   <at name="minimum">0</at>
                                    <at name="value">100</at>
                                    <at name="height">109</at>
                                   </object>