Skip to content

Commit

Permalink
Style account switcher to match the current theme (#4817)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nerixyz committed Sep 15, 2023
1 parent 337b043 commit 2d5f078
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unversioned

- Minor: Migrate to the new Get Channel Followers Helix endpoint, fixing follower count not showing up in usercards. (#4809)
- Minor: The account switcher is now styled to match your theme. (#4817)
- Bugfix: Fixed a performance issue when displaying replies to certain messages. (#4807)
- Bugfix: Fixed a data race when disconnecting from Twitch PubSub. (#4771)
- Bugfix: Fixed `/shoutout` command not working with usernames starting with @'s (e.g. `/shoutout @forsen`). (#4800)
Expand Down
46 changes: 46 additions & 0 deletions src/widgets/AccountSwitchPopup.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "widgets/AccountSwitchPopup.hpp"

#include "common/Literals.hpp"
#include "singletons/Theme.hpp"
#include "widgets/AccountSwitchWidget.hpp"
#include "widgets/dialogs/SettingsDialog.hpp"

Expand All @@ -9,6 +11,8 @@

namespace chatterino {

using namespace literals;

AccountSwitchPopup::AccountSwitchPopup(QWidget *parent)
: BaseWindow({BaseWindow::TopMost, BaseWindow::Frameless,
BaseWindow::DisableLayoutSave},
Expand Down Expand Up @@ -39,6 +43,48 @@ AccountSwitchPopup::AccountSwitchPopup(QWidget *parent)
this->getLayoutContainer()->setLayout(vbox);

this->setScaleIndependantSize(200, 200);
this->themeChangedEvent();
}

void AccountSwitchPopup::themeChangedEvent()
{
BaseWindow::themeChangedEvent();

auto *t = getTheme();
auto color = [](const QColor &c) {
return c.name(QColor::HexArgb);
};
this->setStyleSheet(uR"(
QListView {
color: %1;
background: %2;
}
QListView::item:hover {
background: %3;
}
QListView::item:selected {
background: %4;
}
QPushButton {
background: %5;
color: %1;
}
QPushButton:hover {
background: %3;
}
QPushButton:pressed {
background: %6;
}
chatterino--AccountSwitchPopup {
background: %7;
}
)"_s.arg(color(t->window.text), color(t->splits.header.background),
color(t->splits.header.focusedBackground), color(t->accent),
color(t->tabs.regular.backgrounds.regular),
color(t->tabs.selected.backgrounds.regular),
color(t->window.background)));
}

void AccountSwitchPopup::refresh()
Expand Down
2 changes: 2 additions & 0 deletions src/widgets/AccountSwitchPopup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ class AccountSwitchPopup : public BaseWindow
void focusOutEvent(QFocusEvent *event) final;
void paintEvent(QPaintEvent *event) override;

void themeChangedEvent() override;

private:
struct {
AccountSwitchWidget *accountSwitchWidget = nullptr;
Expand Down

0 comments on commit 2d5f078

Please sign in to comment.