Improve the style of snackbar a bit

2 files changed, 42 insertions, 52 deletions

diff --git a/src/ui/SnackBar.cpp b/src/ui/SnackBar.cpp

index 43a4c85d..8a05d937 100644
--- a/src/ui/SnackBar.cpp
+++ b/src/ui/SnackBar.cpp
@@ -1,40 +1,37 @@
-#include <QDebug>
 #include <QPainter>
 
 #include <tweeny/tweeny.h>
 
 #include "SnackBar.h"
 
-constexpr int STARTING_OFFSET = 1;
+constexpr int STARTING_OFFSET         = 1;
+constexpr int ANIMATION_DURATION      = 6'000;
+constexpr int BOX_PADDING             = 10;
+constexpr double MIN_WIDTH            = 400.0;
+constexpr double MIN_WIDTH_PERCENTAGE = 0.3;
 
 SnackBar::SnackBar(QWidget *parent)
   : OverlayWidget(parent)
 {
-        bgOpacity_  = 0.9;
-        duration_   = 6000;
-        boxWidth_   = 400;
-        boxHeight_  = 40;
-        boxPadding_ = 10;
-        textColor_  = QColor("white");
-        bgColor_    = QColor("#333");
-        offset_     = STARTING_OFFSET;
-        position_   = SnackBarPosition::Top;
-
-        QFont font("Open Sans");
-        font.setPixelSize(14);
+        QFont font;
+        font.setPointSizeF(font.pointSizeF() * 1.2);
         font.setWeight(50);
         setFont(font);
 
+        boxHeight_ = QFontMetrics(font).height() * 2;
+        offset_    = STARTING_OFFSET;
+        position_  = SnackBarPosition::Top;
+
         hideTimer_.setSingleShot(true);
 
         auto offset_anim = tweeny::from(1.0f).to(0.0f).during(100).via(tweeny::easing::cubicOut);
         connect(&showTimer_, &QTimer::timeout, this, [this, offset_anim]() mutable {
                 if (offset_anim.progress() < 1.0f) {
                         offset_ = offset_anim.step(0.07f);
-                        update();
+                        repaint();
                 } else {
                         showTimer_.stop();
-                        hideTimer_.start(duration_);
+                        hideTimer_.start(ANIMATION_DURATION);
                         offset_anim.seek(0.0f);
                 }
         });
@@ -115,27 +112,26 @@ SnackBar::paintEvent(QPaintEvent *event)
         brush.setStyle(Qt::SolidPattern);
         brush.setColor(bgColor_);
         p.setBrush(brush);
-        p.setOpacity(bgOpacity_);
 
-        QRect r(0, 0, boxWidth_, boxHeight_);
+        QRect r(0, 0, std::max(MIN_WIDTH, width() * MIN_WIDTH_PERCENTAGE), boxHeight_);
 
         p.setPen(Qt::white);
         QRect br = p.boundingRect(r, Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, message_);
 
         p.setPen(Qt::NoPen);
-        r = br.united(r).adjusted(-boxPadding_, -boxPadding_, boxPadding_, boxPadding_);
+        r = br.united(r).adjusted(-BOX_PADDING, -BOX_PADDING, BOX_PADDING, BOX_PADDING);
 
         const qreal s = 1 - offset_;
 
         if (position_ == SnackBarPosition::Bottom)
-                p.translate((width() - (r.width() - 2 * boxPadding_)) / 2,
-                            height() - boxPadding_ - s * (r.height()));
+                p.translate((width() - (r.width() - 2 * BOX_PADDING)) / 2,
+                            height() - BOX_PADDING - s * (r.height()));
         else
-                p.translate((width() - (r.width() - 2 * boxPadding_)) / 2,
-                            s * (r.height()) - 2 * boxPadding_);
+                p.translate((width() - (r.width() - 2 * BOX_PADDING)) / 2,
+                            s * (r.height()) - 2 * BOX_PADDING);
 
         br.moveCenter(r.center());
-        p.drawRoundedRect(r.adjusted(0, 0, 0, 3), 3, 3);
+        p.drawRoundedRect(r.adjusted(0, 0, 0, 4), 4, 4);
         p.setPen(textColor_);
         p.drawText(br, Qt::AlignHCenter | Qt::AlignTop | Qt::TextWordWrap, message_);
 }
diff --git a/src/ui/SnackBar.h b/src/ui/SnackBar.h

index eed59c87..15cbf626 100644
--- a/src/ui/SnackBar.h
+++ b/src/ui/SnackBar.h
@@ -17,12 +17,30 @@ class SnackBar : public OverlayWidget
 {
         Q_OBJECT
 
+        Q_PROPERTY(QColor bgColor READ backgroundColor WRITE setBackgroundColor)
+        Q_PROPERTY(QColor textColor READ textColor WRITE setTextColor)
+
 public:
         explicit SnackBar(QWidget *parent);
 
-        inline void setBackgroundColor(const QColor &color);
-        inline void setTextColor(const QColor &color);
-        inline void setPosition(SnackBarPosition pos);
+        QColor backgroundColor() const { return bgColor_; }
+        void setBackgroundColor(const QColor &color)
+        {
+                bgColor_ = color;
+                update();
+        }
+
+        QColor textColor() const { return textColor_; }
+        void setTextColor(const QColor &color)
+        {
+                textColor_ = color;
+                update();
+        }
+        void setPosition(SnackBarPosition pos)
+        {
+                position_ = pos;
+                update();
+        }
 
 public slots:
         void showMessage(const QString &msg);
@@ -49,31 +67,7 @@ private:
         QTimer showTimer_;
         QTimer hideTimer_;
 
-        int duration_;
-        int boxWidth_;
-        int boxHeight_;
-        int boxPadding_;
+        double boxHeight_;
 
         SnackBarPosition position_;
 };
-
-inline void
-SnackBar::setPosition(SnackBarPosition pos)
-{
-        position_ = pos;
-        update();
-}
-
-inline void
-SnackBar::setBackgroundColor(const QColor &color)
-{
-        bgColor_ = color;
-        update();
-}
-
-inline void
-SnackBar::setTextColor(const QColor &color)
-{
-        textColor_ = color;
-        update();
-}