Reimplement error notifications

This commit is contained in:
Nicolas Werner 2022-01-30 19:14:33 +01:00
parent b4278ffaa8
commit 2613275461
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
9 changed files with 111 additions and 111 deletions

View file

@ -84,9 +84,8 @@ MainWindow::MainWindow(QWindow *parent)
connect(chat_page_, &ChatPage::closing, this, [this] { switchToLoginPage(""); });
connect(chat_page_, &ChatPage::unreadMessages, this, &MainWindow::setWindowTitle);
connect(chat_page_, SIGNAL(unreadMessages(int)), trayIcon_, SLOT(setUnreadCount(int)));
connect(chat_page_, &ChatPage::showLoginPage, this, [this](const QString &msg) {
switchToLoginPage(msg);
});
connect(chat_page_, &ChatPage::showLoginPage, this, &MainWindow::switchToLoginPage);
connect(chat_page_, &ChatPage::showNotification, this, &MainWindow::showNotification);
connect(userSettings_.get(), &UserSettings::trayChanged, trayIcon_, &TrayIcon::setVisible);
connect(trayIcon_,

View file

@ -70,6 +70,8 @@ signals:
void reload();
void secretsChanged();
void showNotification(QString msg);
void switchToChatPage();
void switchToWelcomePage();
void switchToLoginPage(QString error);

View file

@ -1,79 +0,0 @@
// SPDX-FileCopyrightText: 2021 Nheko Contributors
// SPDX-FileCopyrightText: 2022 Nheko Contributors
//
// SPDX-License-Identifier: GPL-3.0-or-later
#include "OverlayWidget.h"
#include <QPainter>
#include <QStyleOption>
OverlayWidget::OverlayWidget(QWidget *parent)
: QWidget(parent)
{
if (parent) {
parent->installEventFilter(this);
setGeometry(overlayGeometry());
raise();
}
}
bool
OverlayWidget::event(QEvent *event)
{
if (!parent())
return QWidget::event(event);
switch (event->type()) {
case QEvent::ParentChange: {
parent()->installEventFilter(this);
setGeometry(overlayGeometry());
break;
}
case QEvent::ParentAboutToChange: {
parent()->removeEventFilter(this);
break;
}
default:
break;
}
return QWidget::event(event);
}
bool
OverlayWidget::eventFilter(QObject *obj, QEvent *event)
{
switch (event->type()) {
case QEvent::Move:
case QEvent::Resize:
setGeometry(overlayGeometry());
break;
default:
break;
}
return QWidget::eventFilter(obj, event);
}
QRect
OverlayWidget::overlayGeometry() const
{
QWidget *widget = parentWidget();
if (!widget)
return QRect();
return widget->rect();
}
void
OverlayWidget::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event);
QStyleOption opt;
opt.initFrom(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}

View file

@ -1,26 +0,0 @@
// SPDX-FileCopyrightText: 2021 Nheko Contributors
// SPDX-FileCopyrightText: 2022 Nheko Contributors
//
// SPDX-License-Identifier: GPL-3.0-or-later
#pragma once
#include <QEvent>
#include <QWidget>
class QPainter;
class OverlayWidget : public QWidget
{
Q_OBJECT
public:
explicit OverlayWidget(QWidget *parent = nullptr);
protected:
bool event(QEvent *event) override;
bool eventFilter(QObject *obj, QEvent *event) override;
QRect overlayGeometry() const;
void paintEvent(QPaintEvent *event) override;
};