Skip to content

Commit a778ce0

Browse files
fix: decimal format of webRgbOrHex util method excludes trailing zero
1 parent 79d78a4 commit a778ce0

File tree

2 files changed

+2
-2
lines changed
  • app/display/representation-javafx/src
    • main/java/org/csstudio/display/builder/representation/javafx
    • test/java/org/csstudio/display/builder/representation/javafx

2 files changed

+2
-2
lines changed

app/display/representation-javafx/src/main/java/org/csstudio/display/builder/representation/javafx/JFXUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public class JFXUtil extends org.phoebus.ui.javafx.JFXUtil
3434
{
3535
private static double font_calibration = 1.0;
36-
private static final DecimalFormat RGBA_ALPHA_DECIMAL_FORMAT = new DecimalFormat("#.##");
36+
private static final DecimalFormat RGBA_ALPHA_DECIMAL_FORMAT = new DecimalFormat("0.00");
3737

3838
static
3939
{

app/display/representation-javafx/src/test/java/org/csstudio/display/builder/representation/javafx/JFXUtilTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void testRGB()
3838
{
3939
assertThat(JFXUtil.webRgbOrHex(new WidgetColor(15, 255, 0)), equalTo("#0FFF00"));
4040
assertThat(JFXUtil.webRgbOrHex(new WidgetColor(0, 16, 255)), equalTo("#0010FF"));
41-
assertThat(JFXUtil.webRgbOrHex(new WidgetColor(0, 16, 255, 50)), equalTo("rgba(0,16,255,0.19607843)"));
41+
assertThat(JFXUtil.webRgbOrHex(new WidgetColor(0, 16, 255, 50)), equalTo("rgba(0,16,255,0.20)"));
4242
}
4343

4444
@Test

0 commit comments

Comments
 (0)