added code for a notification system

chatterino.pro

@@ -203,7 +203,8 @@ SOURCES += \
     src/controllers/accounts/account.cpp \
     src/widgets/helper/splitoverlay.cpp \
     src/widgets/helper/dropoverlay.cpp \
-    src/widgets/helper/splitnode.cpp
+    src/widgets/helper/splitnode.cpp \
+    src/widgets/notificationpopup.cpp
 
 HEADERS  += \
     src/precompiled_header.hpp \
@@ -351,7 +352,8 @@ HEADERS  += \
     src/util/sharedptrelementless.hpp \
     src/widgets/helper/splitoverlay.hpp \
     src/widgets/helper/dropoverlay.hpp \
-    src/widgets/helper/splitnode.hpp
+    src/widgets/helper/splitnode.hpp \
+    src/widgets/notificationpopup.hpp
 
 RESOURCES += \
     resources/resources.qrc

src/controllers/highlights/highlightcontroller.cpp

@@ -2,6 +2,7 @@
 
 #include "application.hpp"
 #include "controllers/highlights/highlightmodel.hpp"
+#include "widgets/notificationpopup.hpp"
 
 namespace chatterino {
 namespace controllers {
@@ -34,6 +35,15 @@ HighlightModel *HighlightController::createModel(QObject *parent)
     return model;
 }
 
+void HighlightController::addHighlight(const messages::MessagePtr &msg)
+{
+    //    static widgets::NotificationPopup popup;
+
+    //    popup.updatePosition();
+    //    popup.addMessage(msg);
+    //    popup.show();
+}
+
 }  // namespace highlights
 }  // namespace controllers
 }  // namespace chatterino

src/controllers/highlights/highlightcontroller.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "controllers/highlights/highlightphrase.hpp"
+#include "messages/message.hpp"
 #include "singletons/settingsmanager.hpp"
 #include "util/signalvector2.hpp"
 
@@ -21,6 +22,8 @@ public:
 
     HighlightModel *createModel(QObject *parent);
 
+    void addHighlight(const messages::MessagePtr &msg);
+
 private:
     bool initialized = false;
 

src/providers/twitch/twitchserver.cpp

@@ -1,6 +1,7 @@
 #include "twitchserver.hpp"
 
 #include "application.hpp"
+#include "controllers/highlights/highlightcontroller.hpp"
 #include "providers/twitch/ircmessagehandler.hpp"
 #include "providers/twitch/twitchaccount.hpp"
 #include "providers/twitch/twitchhelpers.hpp"
@@ -93,12 +94,13 @@ void TwitchServer::privateMessageReceived(IrcPrivateMessage *message)
     TwitchMessageBuilder builder(chan.get(), message, args);
 
     if (!builder.isIgnored()) {
-        messages::MessagePtr _message = builder.build();
+        messages::MessagePtr msg = builder.build();
-        if (_message->flags & messages::Message::Highlighted) {
+        if (msg->flags & messages::Message::Highlighted) {
-            this->mentionsChannel->addMessage(_message);
+            this->mentionsChannel->addMessage(msg);
+            getApp()->highlights->addHighlight(msg);
         }
 
-        chan->addMessage(_message);
+        chan->addMessage(msg);
     }
 }
 

src/widgets/basewidget.hpp

@@ -26,7 +26,7 @@ public:
     QSize getScaleIndependantSize() const;
     int getScaleIndependantWidth() const;
     int getScaleIndependantHeight() const;
-    void setScaleIndependantSize(int width, int yOffset);
+    void setScaleIndependantSize(int width, int height);
     void setScaleIndependantSize(QSize);
     void setScaleIndependantWidth(int value);
     void setScaleIndependantHeight(int value);

src/widgets/basewindow.cpp

@@ -32,10 +32,16 @@
 namespace chatterino {
 namespace widgets {
 
-BaseWindow::BaseWindow(QWidget *parent, bool _enableCustomFrame)
+BaseWindow::BaseWindow(QWidget *parent, Flags flags)
     : BaseWidget(parent, Qt::Window)
-    , enableCustomFrame(_enableCustomFrame)
+    , enableCustomFrame(flags & EnableCustomFrame)
+    , frameless(flags & FrameLess)
 {
+    if (this->frameless) {
+        this->enableCustomFrame = false;
+        this->setWindowFlag(Qt::FramelessWindowHint);
+    }
+
     this->init();
 }
 
@@ -53,55 +59,57 @@ void BaseWindow::init()
         layout->setSpacing(0);
         this->setLayout(layout);
         {
-            QHBoxLayout *buttonLayout = this->ui.titlebarBox = new QHBoxLayout();
+            if (!this->frameless) {
-            buttonLayout->setMargin(0);
+                QHBoxLayout *buttonLayout = this->ui.titlebarBox = new QHBoxLayout();
-            layout->addLayout(buttonLayout);
+                buttonLayout->setMargin(0);
+                layout->addLayout(buttonLayout);
 
-            // title
+                // title
-            QLabel *title = new QLabel("   Chatterino");
+                QLabel *title = new QLabel("   Chatterino");
-            QObject::connect(this, &QWidget::windowTitleChanged,
+                QObject::connect(this, &QWidget::windowTitleChanged,
-                             [title](const QString &text) { title->setText("   " + text); });
+                                 [title](const QString &text) { title->setText("   " + text); });
 
-            QSizePolicy policy(QSizePolicy::Ignored, QSizePolicy::Preferred);
+                QSizePolicy policy(QSizePolicy::Ignored, QSizePolicy::Preferred);
-            policy.setHorizontalStretch(1);
+                policy.setHorizontalStretch(1);
-            //            title->setBaseSize(0, 0);
+                //            title->setBaseSize(0, 0);
-            title->setScaledContents(true);
+                title->setScaledContents(true);
-            title->setSizePolicy(policy);
+                title->setSizePolicy(policy);
-            buttonLayout->addWidget(title);
+                buttonLayout->addWidget(title);
-            this->ui.titleLabel = title;
+                this->ui.titleLabel = title;
 
-            // buttons
+                // buttons
-            TitleBarButton *_minButton = new TitleBarButton;
+                TitleBarButton *_minButton = new TitleBarButton;
-            _minButton->setButtonStyle(TitleBarButton::Minimize);
+                _minButton->setButtonStyle(TitleBarButton::Minimize);
-            TitleBarButton *_maxButton = new TitleBarButton;
+                TitleBarButton *_maxButton = new TitleBarButton;
-            _maxButton->setButtonStyle(TitleBarButton::Maximize);
+                _maxButton->setButtonStyle(TitleBarButton::Maximize);
-            TitleBarButton *_exitButton = new TitleBarButton;
+                TitleBarButton *_exitButton = new TitleBarButton;
-            _exitButton->setButtonStyle(TitleBarButton::Close);
+                _exitButton->setButtonStyle(TitleBarButton::Close);
 
-            QObject::connect(_minButton, &TitleBarButton::clicked, this, [this] {
+                QObject::connect(_minButton, &TitleBarButton::clicked, this, [this] {
-                this->setWindowState(Qt::WindowMinimized | this->windowState());
+                    this->setWindowState(Qt::WindowMinimized | this->windowState());
-            });
+                });
-            QObject::connect(_maxButton, &TitleBarButton::clicked, this, [this] {
+                QObject::connect(_maxButton, &TitleBarButton::clicked, this, [this] {
-                this->setWindowState(this->windowState() == Qt::WindowMaximized
+                    this->setWindowState(this->windowState() == Qt::WindowMaximized
-                                         ? Qt::WindowActive
+                                             ? Qt::WindowActive
-                                         : Qt::WindowMaximized);
+                                             : Qt::WindowMaximized);
-            });
+                });
-            QObject::connect(_exitButton, &TitleBarButton::clicked, this,
+                QObject::connect(_exitButton, &TitleBarButton::clicked, this,
-                             [this] { this->close(); });
+                                 [this] { this->close(); });
 
-            this->ui.minButton = _minButton;
+                this->ui.minButton = _minButton;
-            this->ui.maxButton = _maxButton;
+                this->ui.maxButton = _maxButton;
-            this->ui.exitButton = _exitButton;
+                this->ui.exitButton = _exitButton;
 
-            this->ui.buttons.push_back(_minButton);
+                this->ui.buttons.push_back(_minButton);
-            this->ui.buttons.push_back(_maxButton);
+                this->ui.buttons.push_back(_maxButton);
-            this->ui.buttons.push_back(_exitButton);
+                this->ui.buttons.push_back(_exitButton);
 
-            //            buttonLayout->addStretch(1);
+                //            buttonLayout->addStretch(1);
-            buttonLayout->addWidget(_minButton);
+                buttonLayout->addWidget(_minButton);
-            buttonLayout->addWidget(_maxButton);
+                buttonLayout->addWidget(_maxButton);
-            buttonLayout->addWidget(_exitButton);
+                buttonLayout->addWidget(_exitButton);
-            buttonLayout->setSpacing(0);
+                buttonLayout->setSpacing(0);
+            }
         }
         this->ui.layoutBase = new BaseWidget(this);
         layout->addWidget(this->ui.layoutBase);
@@ -165,10 +173,12 @@ void BaseWindow::themeRefreshEvent()
         palette.setColor(QPalette::Foreground, this->themeManager->window.text);
         this->setPalette(palette);
 
-        QPalette palette_title;
+        if (this->ui.titleLabel) {
-        palette_title.setColor(QPalette::Foreground,
+            QPalette palette_title;
-                               this->themeManager->isLightTheme() ? "#333" : "#ccc");
+            palette_title.setColor(QPalette::Foreground,
-        this->ui.titleLabel->setPalette(palette_title);
+                                   this->themeManager->isLightTheme() ? "#333" : "#ccc");
+            this->ui.titleLabel->setPalette(palette_title);
+        }
 
         for (RippleEffectButton *button : this->ui.buttons) {
             button->setMouseEffectColor(this->themeManager->window.text);
@@ -212,7 +222,7 @@ void BaseWindow::changeEvent(QEvent *)
     TooltipWidget::getInstance()->hide();
 
 #ifdef USEWINSDK
-    if (this->hasCustomWindowFrame()) {
+    if (this->ui.maxButton) {
         this->ui.maxButton->setButtonStyle(this->windowState() & Qt::WindowMaximized
                                                ? TitleBarButton::Unmaximize
                                                : TitleBarButton::Maximize);
@@ -449,13 +459,19 @@ void BaseWindow::calcButtonsSizes()
         return;
     }
     if ((this->width() / this->getScale()) < 300) {
-        this->ui.minButton->setScaleIndependantSize(30, 30);
+        if (this->ui.minButton)
-        this->ui.maxButton->setScaleIndependantSize(30, 30);
+            this->ui.minButton->setScaleIndependantSize(30, 30);
-        this->ui.exitButton->setScaleIndependantSize(30, 30);
+        if (this->ui.maxButton)
+            this->ui.maxButton->setScaleIndependantSize(30, 30);
+        if (this->ui.exitButton)
+            this->ui.exitButton->setScaleIndependantSize(30, 30);
     } else {
-        this->ui.minButton->setScaleIndependantSize(46, 30);
+        if (this->ui.minButton)
-        this->ui.maxButton->setScaleIndependantSize(46, 30);
+            this->ui.minButton->setScaleIndependantSize(46, 30);
-        this->ui.exitButton->setScaleIndependantSize(46, 30);
+        if (this->ui.maxButton)
+            this->ui.maxButton->setScaleIndependantSize(46, 30);
+        if (this->ui.exitButton)
+            this->ui.exitButton->setScaleIndependantSize(46, 30);
     }
 }
 }  // namespace widgets

src/widgets/basewindow.hpp

@@ -19,7 +19,9 @@ class BaseWindow : public BaseWidget
     Q_OBJECT
 
 public:
-    explicit BaseWindow(QWidget *parent = nullptr, bool enableCustomFrame = false);
+    enum Flags { None = 0, EnableCustomFrame = 1, FrameLess = 2 };
+
+    explicit BaseWindow(QWidget *parent = nullptr, Flags flags = None);
 
     QWidget *getLayoutContainer();
     bool hasCustomWindowFrame();
@@ -51,16 +53,17 @@ private:
     void calcButtonsSizes();
 
     bool enableCustomFrame;
+    bool frameless;
     bool stayInScreenRect = false;
     bool shown = false;
 
     struct {
-        QHBoxLayout *titlebarBox;
+        QHBoxLayout *titlebarBox = nullptr;
-        QWidget *titleLabel;
+        QWidget *titleLabel = nullptr;
         TitleBarButton *minButton = nullptr;
         TitleBarButton *maxButton = nullptr;
         TitleBarButton *exitButton = nullptr;
-        QWidget *layoutBase;
+        QWidget *layoutBase = nullptr;
         std::vector<RippleEffectButton *> buttons;
     } ui;
 };

src/widgets/emotepopup.cpp

@@ -17,7 +17,7 @@ namespace chatterino {
 namespace widgets {
 
 EmotePopup::EmotePopup()
-    : BaseWindow(nullptr, true)
+    : BaseWindow(nullptr, BaseWindow::EnableCustomFrame)
 {
     this->viewEmotes = new ChannelView();
     this->viewEmojis = new ChannelView();

src/widgets/notificationpopup.cpp

@@ -0,0 +1,50 @@
+#include "notificationpopup.hpp"
+
+#include "widgets/helper/channelview.hpp"
+
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QScreen>
+
+namespace chatterino {
+namespace widgets {
+
+NotificationPopup::NotificationPopup()
+    : BaseWindow((QWidget *)nullptr, BaseWindow::FrameLess)
+    , channel(std::make_shared<Channel>("notifications", Channel::None))
+
+{
+    this->channelView = new ChannelView(this);
+
+    auto *layout = new QVBoxLayout(this);
+    this->setLayout(layout);
+
+    layout->addWidget(this->channelView);
+
+    this->channelView->setChannel(this->channel);
+    this->setScaleIndependantSize(300, 150);
+}
+
+void NotificationPopup::updatePosition()
+{
+    Location location = BottomRight;
+
+    QDesktopWidget *desktop = QApplication::desktop();
+    const QRect rect = desktop->availableGeometry();
+
+    switch (location) {
+        case BottomRight: {
+            this->move(rect.right() - this->width(), rect.bottom() - this->height());
+        } break;
+    }
+}
+
+void NotificationPopup::addMessage(messages::MessagePtr msg)
+{
+    this->channel->addMessage(msg);
+
+    //    QTimer::singleShot(5000, this, [this, msg] { this->channel->remove });
+}
+
+}  // namespace widgets
+}  // namespace chatterino

src/widgets/notificationpopup.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "channel.hpp"
+#include "messages/message.hpp"
+#include "widgets/basewindow.hpp"
+
+namespace chatterino {
+namespace widgets {
+
+class ChannelView;
+
+class NotificationPopup : public BaseWindow
+{
+public:
+    enum Location { TopLeft, TopRight, BottomLeft, BottomRight };
+    NotificationPopup();
+
+    void addMessage(messages::MessagePtr msg);
+    void updatePosition();
+
+private:
+    ChannelView *channelView;
+    ChannelPtr channel;
+};
+
+}  // namespace widgets
+}  // namespace chatterino

src/widgets/selectchanneldialog.cpp

@@ -17,7 +17,7 @@ namespace chatterino {
 namespace widgets {
 
 SelectChannelDialog::SelectChannelDialog()
-    : BaseWindow((QWidget *)nullptr, true)
+    : BaseWindow((QWidget *)nullptr, BaseWindow::EnableCustomFrame)
     , selectedChannel(Channel::getEmpty())
 {
     this->setWindowTitle("Select a channel to join");

src/widgets/window.cpp

@@ -24,7 +24,7 @@ namespace chatterino {
 namespace widgets {
 
 Window::Window(WindowType _type)
-    : BaseWindow(nullptr, true)
+    : BaseWindow(nullptr, BaseWindow::EnableCustomFrame)
     , type(_type)
     , dpi(this->getScale())
     , notebook(this)