Merge branch 'master' into state-machines-experiements

This commit is contained in:
Jordan Petridis
2018-02-22 12:14:55 +00:00
32 changed files with 382 additions and 280 deletions
+1
View File
@@ -269,6 +269,7 @@ fn update_progressbar_callback(
}
#[inline]
#[allow(if_same_then_else)]
fn progress_bar_helper(
prog: Arc<Mutex<manager::Progress>>,
media: Arc<Mutex<MediaMachine>>,
+2 -1
View File
@@ -105,7 +105,8 @@ impl ShowWidget {
/// Set the descripton text.
fn set_description(&self, text: &str) {
// TODO: Temporary solution until we render html urls/bold/italic probably with markup.
// TODO: Temporary solution until we render html urls/bold/italic probably with
// markup.
let desc = dissolve::strip_html_tags(text).join(" ");
self.description.set_text(&replace_extra_spaces(&desc));
}