From eb2a6a32649ac3cba85e2832e549abea025e547a Mon Sep 17 00:00:00 2001
From: Daniel Wolf <dwolf@dannad.de>
Date: Fri, 16 Feb 2018 21:29:34 +0100
Subject: [PATCH] Unified progress bar code

---
 .../rhubarb_for_spine/MainView.kt               | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/extras/rhubarb-for-spine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/MainView.kt b/extras/rhubarb-for-spine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/MainView.kt
index 2f21b99..f65e7af 100644
--- a/extras/rhubarb-for-spine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/MainView.kt
+++ b/extras/rhubarb-for-spine/src/main/kotlin/com/rhubarb_lip_sync/rhubarb_for_spine/MainView.kt
@@ -133,21 +133,20 @@ class MainView : View() {
 										AudioFileStatus.NotAnimated -> Text("Not animated").apply {
 											fill = Color.GRAY
 										}
-										AudioFileStatus.Pending -> ProgressBar().apply {
-											progress = -1.0 // Indeterminate
-											maxWidth = Double.MAX_VALUE
-										}
+										AudioFileStatus.Pending,
 										AudioFileStatus.Animating -> HBox().apply {
-											val progress = state.progress ?: 0.0
-											val bar = progressbar(progress) {
+											val progress: Double? = state.progress
+											val indeterminate = -1.0
+											val bar = progressbar(progress ?: indeterminate) {
 												maxWidth = Double.MAX_VALUE
 											}
 											HBox.setHgrow(bar, Priority.ALWAYS)
-											val progressString = "${(progress * 100).toInt()}%"
 											hbox {
 												minWidth = 30.0
-												text(progressString) {
-													alignment = Pos.BASELINE_RIGHT
+												if (progress != null) {
+													text("${(progress * 100).toInt()}%") {
+														alignment = Pos.BASELINE_RIGHT
+													}
 												}
 											}
 										}