Skip to content

Commit 2a9713d

Browse files
committed
Revert "CSSTUDIO-3429 Call setTextFill(text_color) when square_led == false."
This reverts commit fce5f18.
1 parent 107c1ce commit 2a9713d

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

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

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -428,25 +428,20 @@ public void updateChanges()
428428
for (int i = 0; i < N; i++)
429429
{
430430
leds[i].setFill(save_values[i]);
431-
if (save_labels[i] != null) {
432-
if (square_led)
433-
{
434-
// Compare brightness of LED with text.
435-
final double brightness = Brightness.of(save_values[i]);
436-
if (Math.abs(text_brightness - brightness) < Brightness.SIMILARITY_THRESHOLD)
437-
{ // Colors of text and LED are very close in brightness.
438-
// Make text visible by forcing black resp. white
439-
if (brightness > Brightness.BRIGHT_THRESHOLD)
440-
save_labels[i].setTextFill(Color.BLACK);
441-
else
442-
save_labels[i].setTextFill(Color.WHITE);
443-
}
431+
if (save_labels[i] != null && square_led)
432+
{
433+
// Compare brightness of LED with text.
434+
final double brightness = Brightness.of(save_values[i]);
435+
if (Math.abs(text_brightness - brightness) < Brightness.SIMILARITY_THRESHOLD)
436+
{ // Colors of text and LED are very close in brightness.
437+
// Make text visible by forcing black resp. white
438+
if (brightness > Brightness.BRIGHT_THRESHOLD)
439+
save_labels[i].setTextFill(Color.BLACK);
444440
else
445-
save_labels[i].setTextFill(text_color);
441+
save_labels[i].setTextFill(Color.WHITE);
446442
}
447-
else {
443+
else
448444
save_labels[i].setTextFill(text_color);
449-
}
450445
save_labels[i].layout();
451446
}
452447
}

0 commit comments

Comments
 (0)