Fix resize slowness on the TopBar

2 files changed, 30 insertions, 16 deletions

diff --git a/include/Config.h b/include/Config.h

index 9cce1929..f8fd27cd 100644
--- a/include/Config.h
+++ b/include/Config.h
@@ -75,8 +75,8 @@ constexpr int communityBubble = bubble - 4;
 
 namespace userInfoWidget {
 namespace fonts {
-constexpr int displayName = 16;
-constexpr int userid      = 14;
+constexpr int displayName = 15;
+constexpr int userid      = 13;
 } // namespace fonts
 } // namespace userInfoWidget
 
diff --git a/include/TopRoomBar.h b/include/TopRoomBar.h

index 54b89a59..73fad9ee 100644
--- a/include/TopRoomBar.h
+++ b/include/TopRoomBar.h
@@ -22,12 +22,15 @@
 #include <QImage>
 #include <QLabel>
 #include <QPaintEvent>
+#include <QPainter>
+#include <QPen>
 #include <QSharedPointer>
+#include <QStyle>
+#include <QStyleOption>
 #include <QVBoxLayout>
 
 class Avatar;
 class FlatButton;
-class Label;
 class Menu;
 class OverlayModal;
 
@@ -55,21 +58,35 @@ signals:
         void inviteUsers(QStringList users);
 
 protected:
-        void paintEvent(QPaintEvent *event) override;
-        void mousePressEvent(QMouseEvent *event) override;
+        void mousePressEvent(QMouseEvent *) override
+        {
+                if (roomSettings_ != nullptr)
+                        roomSettings_->trigger();
+        }
+
+        void paintEvent(QPaintEvent *) override
+        {
+                QStyleOption opt;
+                opt.init(this);
+                QPainter p(this);
+                style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+
+                p.setPen(QPen(borderColor()));
+                p.drawLine(QPointF(0, height()), QPointF(width(), height()));
+        }
 
 private:
-        QHBoxLayout *topLayout_;
-        QVBoxLayout *textLayout_;
+        QHBoxLayout *topLayout_  = nullptr;
+        QVBoxLayout *textLayout_ = nullptr;
 
-        QLabel *nameLabel_;
-        Label *topicLabel_;
+        QLabel *nameLabel_  = nullptr;
+        QLabel *topicLabel_ = nullptr;
 
         Menu *menu_;
-        QAction *leaveRoom_;
-        QAction *roomMembers_;
-        QAction *roomSettings_;
-        QAction *inviteUsers_;
+        QAction *leaveRoom_    = nullptr;
+        QAction *roomMembers_  = nullptr;
+        QAction *roomSettings_ = nullptr;
+        QAction *inviteUsers_  = nullptr;
 
         FlatButton *settingsBtn_;
 
@@ -77,8 +94,5 @@ private:
 
         int buttonSize_;
 
-        QString roomName_;
-        QString roomTopic_;
-
         QColor borderColor_;
 };