mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
renamed AccountSwitchPopupWidget -> AccountSwitchPopup
This has been triggering me forever
This commit is contained in:
parent
19960b5d8f
commit
ae20acb7ea
5 changed files with 473 additions and 473 deletions
|
@ -171,7 +171,7 @@ SOURCES += \
|
||||||
src/util/JsonQuery.cpp \
|
src/util/JsonQuery.cpp \
|
||||||
src/util/RapidjsonHelpers.cpp \
|
src/util/RapidjsonHelpers.cpp \
|
||||||
src/util/StreamLink.cpp \
|
src/util/StreamLink.cpp \
|
||||||
src/widgets/AccountSwitchPopupWidget.cpp \
|
src/widgets/AccountSwitchPopup.cpp \
|
||||||
src/widgets/AccountSwitchWidget.cpp \
|
src/widgets/AccountSwitchWidget.cpp \
|
||||||
src/widgets/AttachedWindow.cpp \
|
src/widgets/AttachedWindow.cpp \
|
||||||
src/widgets/dialogs/EmotePopup.cpp \
|
src/widgets/dialogs/EmotePopup.cpp \
|
||||||
|
@ -354,7 +354,7 @@ HEADERS += \
|
||||||
src/util/SharedPtrElementLess.hpp \
|
src/util/SharedPtrElementLess.hpp \
|
||||||
src/util/StandardItemHelper.hpp \
|
src/util/StandardItemHelper.hpp \
|
||||||
src/util/StreamLink.hpp \
|
src/util/StreamLink.hpp \
|
||||||
src/widgets/AccountSwitchPopupWidget.hpp \
|
src/widgets/AccountSwitchPopup.hpp \
|
||||||
src/widgets/AccountSwitchWidget.hpp \
|
src/widgets/AccountSwitchWidget.hpp \
|
||||||
src/widgets/AttachedWindow.hpp \
|
src/widgets/AttachedWindow.hpp \
|
||||||
src/widgets/dialogs/EmotePopup.hpp \
|
src/widgets/dialogs/EmotePopup.hpp \
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "singletons/Settings.hpp"
|
#include "singletons/Settings.hpp"
|
||||||
#include "singletons/Theme.hpp"
|
#include "singletons/Theme.hpp"
|
||||||
#include "util/Clamp.hpp"
|
#include "util/Clamp.hpp"
|
||||||
#include "widgets/AccountSwitchPopupWidget.hpp"
|
#include "widgets/AccountSwitchPopup.hpp"
|
||||||
#include "widgets/Notebook.hpp"
|
#include "widgets/Notebook.hpp"
|
||||||
#include "widgets/Window.hpp"
|
#include "widgets/Window.hpp"
|
||||||
#include "widgets/dialogs/SettingsDialog.hpp"
|
#include "widgets/dialogs/SettingsDialog.hpp"
|
||||||
|
@ -63,7 +63,7 @@ void WindowManager::showSettingsDialog(SettingsDialogPreference preference)
|
||||||
void WindowManager::showAccountSelectPopup(QPoint point)
|
void WindowManager::showAccountSelectPopup(QPoint point)
|
||||||
{
|
{
|
||||||
// static QWidget *lastFocusedWidget = nullptr;
|
// static QWidget *lastFocusedWidget = nullptr;
|
||||||
static AccountSwitchPopupWidget *w = new AccountSwitchPopupWidget();
|
static AccountSwitchPopup *w = new AccountSwitchPopup();
|
||||||
|
|
||||||
if (w->hasFocus())
|
if (w->hasFocus())
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "widgets/AccountSwitchPopupWidget.hpp"
|
#include "widgets/AccountSwitchPopup.hpp"
|
||||||
#include "debug/Log.hpp"
|
#include "debug/Log.hpp"
|
||||||
#include "widgets/dialogs/SettingsDialog.hpp"
|
#include "widgets/dialogs/SettingsDialog.hpp"
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
namespace chatterino {
|
namespace chatterino {
|
||||||
|
|
||||||
AccountSwitchPopupWidget::AccountSwitchPopupWidget(QWidget *parent)
|
AccountSwitchPopup::AccountSwitchPopup(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
{
|
{
|
||||||
this->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
|
this->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
|
||||||
|
@ -43,17 +43,17 @@ AccountSwitchPopupWidget::AccountSwitchPopupWidget(QWidget *parent)
|
||||||
// this->setStyleSheet("background: #333");
|
// this->setStyleSheet("background: #333");
|
||||||
}
|
}
|
||||||
|
|
||||||
void AccountSwitchPopupWidget::refresh()
|
void AccountSwitchPopup::refresh()
|
||||||
{
|
{
|
||||||
this->ui_.accountSwitchWidget->refresh();
|
this->ui_.accountSwitchWidget->refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AccountSwitchPopupWidget::focusOutEvent(QFocusEvent *)
|
void AccountSwitchPopup::focusOutEvent(QFocusEvent *)
|
||||||
{
|
{
|
||||||
this->hide();
|
this->hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AccountSwitchPopupWidget::paintEvent(QPaintEvent *)
|
void AccountSwitchPopup::paintEvent(QPaintEvent *)
|
||||||
{
|
{
|
||||||
QPainter painter(this);
|
QPainter painter(this);
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
|
|
||||||
namespace chatterino {
|
namespace chatterino {
|
||||||
|
|
||||||
class AccountSwitchPopupWidget : public QWidget
|
class AccountSwitchPopup : public QWidget
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AccountSwitchPopupWidget(QWidget *parent = nullptr);
|
AccountSwitchPopup(QWidget *parent = nullptr);
|
||||||
|
|
||||||
void refresh();
|
void refresh();
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
#include "singletons/WindowManager.hpp"
|
#include "singletons/WindowManager.hpp"
|
||||||
#include "util/InitUpdateButton.hpp"
|
#include "util/InitUpdateButton.hpp"
|
||||||
#include "util/Shortcut.hpp"
|
#include "util/Shortcut.hpp"
|
||||||
#include "widgets/AccountSwitchPopupWidget.hpp"
|
#include "widgets/AccountSwitchPopup.hpp"
|
||||||
#include "widgets/Notebook.hpp"
|
#include "widgets/Notebook.hpp"
|
||||||
#include "widgets/dialogs/SettingsDialog.hpp"
|
#include "widgets/dialogs/SettingsDialog.hpp"
|
||||||
#include "widgets/dialogs/UpdateDialog.hpp"
|
#include "widgets/dialogs/UpdateDialog.hpp"
|
||||||
|
|
Loading…
Reference in a new issue