From a4136ff9fefc3586218d88d5f7755a51baf26d07 Mon Sep 17 00:00:00 2001 From: blue Date: Mon, 27 Jan 2020 18:07:38 +0300 Subject: [PATCH] progress spinner fix, new lines in messages now display again --- ui/utils/message.cpp | 1 + ui/utils/progress.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/utils/message.cpp b/ui/utils/message.cpp index 1725a9b..c20930f 100644 --- a/ui/utils/message.cpp +++ b/ui/utils/message.cpp @@ -60,6 +60,7 @@ Message::Message(const Shared::Message& source, bool outgoing, const QString& p_ QString bd = msg.getBody(); //bd.replace(imgReg, ""); bd.replace(urlReg, "\\1"); + bd.replace("\n", "
"); text->setTextFormat(Qt::RichText); text->setText(bd);; text->setTextInteractionFlags(text->textInteractionFlags() | Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse); diff --git a/ui/utils/progress.cpp b/ui/utils/progress.cpp index 95eafa2..a028822 100644 --- a/ui/utils/progress.cpp +++ b/ui/utils/progress.cpp @@ -39,9 +39,9 @@ Progress::Progress(quint16 p_size, QWidget* parent): pixmap->setTransformationMode(Qt::SmoothTransformation); pixmap->setOffset(0, 0); - animation.setDuration(500); + animation.setDuration(1000); animation.setStartValue(0.0f); - animation.setEndValue(180.0f); + animation.setEndValue(360.0f); animation.setLoopCount(-1); connect(&animation, &QVariantAnimation::valueChanged, this, &Progress::onValueChanged);