aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2018-09-28 13:49:58 +0200
committerRobert Jaros <rjaros@finn.pl>2018-09-28 13:49:58 +0200
commit91ae1d02de111f15608e84193c10ed17bea9fe41 (patch)
treeac9f0166d30f07d621328192399ccef1c0640a41
parent1c021517808829418ac9bc8443e6b2653c869812 (diff)
parent195ed86e21a5157e56b8e2cacb32602d93308e5b (diff)
downloadkvision-91ae1d02de111f15608e84193c10ed17bea9fe41.tar.gz
kvision-91ae1d02de111f15608e84193c10ed17bea9fe41.tar.bz2
kvision-91ae1d02de111f15608e84193c10ed17bea9fe41.zip
Merge branch 'master' into kotlin-1.3
-rw-r--r--src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt b/src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt
index 17010b5c..4d0f4b93 100644
--- a/src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/progress/ProgressBar.kt
@@ -97,6 +97,30 @@ open class ProgressBar(
set(value) {
indicator.animated = value
}
+ /**
+ * Text content of the progress bar.
+ */
+ var content
+ get() = indicator.content
+ set(value) {
+ indicator.content = value
+ }
+ /**
+ * Determines if [content] can contain HTML code.
+ */
+ var rich
+ get() = indicator.rich
+ set(value) {
+ indicator.rich = value
+ }
+ /**
+ * Text align of the progress bar.
+ */
+ var align
+ get() = indicator.align
+ set(value) {
+ indicator.align = value
+ }
internal val indicator = ProgressIndicator(progress, min, max, style, striped, animated, content, rich, align)