fix: make QLineEdit's less ugly in light themes (#6055)

This commit is contained in:
pajlada
2025-03-09 17:10:49 +01:00
committed by GitHub
parent 6b80321083
commit 037196ec3b
6 changed files with 36 additions and 10 deletions
+1
View File
@@ -35,6 +35,7 @@
- Bugfix: Fixed user info popup's opened from `/live` making some network requests that always failed. (#5959) - Bugfix: Fixed user info popup's opened from `/live` making some network requests that always failed. (#5959)
- Bugfix: Ensure miniaudio backend exits even if it doesn't exit cleanly. (#5896) - Bugfix: Ensure miniaudio backend exits even if it doesn't exit cleanly. (#5896)
- Bugfix: Fixed search in emote popup not always working correctly. (#5946) - Bugfix: Fixed search in emote popup not always working correctly. (#5946)
- Bugfix: Fixed some text inputs being dark in light themes. (#6055)
- Bugfix: Fixed channel point redemptions with messages not showing up if PubSub is disconnected. (#5948) - Bugfix: Fixed channel point redemptions with messages not showing up if PubSub is disconnected. (#5948)
- Bugfix: Fixed the input font not immediately updating when zooming in/out. (#5960) - Bugfix: Fixed the input font not immediately updating when zooming in/out. (#5960)
- Bugfix: Fixed missing special shortcut for Windows live notifications. (#5975) - Bugfix: Fixed missing special shortcut for Windows live notifications. (#5975)
+13
View File
@@ -16,6 +16,7 @@
#include "providers/twitch/TwitchChannel.hpp" #include "providers/twitch/TwitchChannel.hpp"
#include "singletons/Emotes.hpp" #include "singletons/Emotes.hpp"
#include "singletons/Settings.hpp" #include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp" #include "singletons/WindowManager.hpp"
#include "util/Helpers.hpp" #include "util/Helpers.hpp"
#include "widgets/helper/ChannelView.hpp" #include "widgets/helper/ChannelView.hpp"
@@ -315,6 +316,8 @@ EmotePopup::EmotePopup(QWidget *parent)
} }
this->reloadEmotes(); this->reloadEmotes();
}); });
this->themeChangedEvent();
} }
void EmotePopup::addShortcuts() void EmotePopup::addShortcuts()
@@ -660,6 +663,16 @@ void EmotePopup::moveEvent(QMoveEvent *event)
BasePopup::moveEvent(event); BasePopup::moveEvent(event);
} }
void EmotePopup::themeChangedEvent()
{
BasePopup::themeChangedEvent();
// NOTE: This currently overrides the QLineEdit's font size.
// If the dialog is open when the theme is changed, things will look a bit off.
// This can be alleviated by us using a single application-wide style sheet for these things.
this->search_->setStyleSheet(this->theme->splits.input.styleSheet);
}
void EmotePopup::closeEvent(QCloseEvent *event) void EmotePopup::closeEvent(QCloseEvent *event)
{ {
this->saveBounds(); this->saveBounds();
+1
View File
@@ -28,6 +28,7 @@ public:
protected: protected:
void resizeEvent(QResizeEvent *event) override; void resizeEvent(QResizeEvent *event) override;
void moveEvent(QMoveEvent *event) override; void moveEvent(QMoveEvent *event) override;
void themeChangedEvent() override;
private: private:
ChannelView *globalEmotesView_{}; ChannelView *globalEmotesView_{};
+7 -10
View File
@@ -191,6 +191,8 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
this->ui_.twitch.channel->setFocus(); this->ui_.twitch.channel->setFocus();
this->addShortcuts(); this->addShortcuts();
this->themeChangedEvent();
} }
void SelectChannelDialog::ok() void SelectChannelDialog::ok()
@@ -392,16 +394,11 @@ void SelectChannelDialog::themeChangedEvent()
{ {
BaseWindow::themeChangedEvent(); BaseWindow::themeChangedEvent();
if (this->theme->isLightTheme()) // NOTE: This currently overrides the QLineEdit's font size.
{ // If the dialog is open when the theme is changed, things will look a bit off.
this->setStyleSheet( // This can be alleviated by us using a single application-wide style sheet for these things.
"QRadioButton { color: #000 } QLabel { color: #000 }"); this->ui_.twitch.channelName->setStyleSheet(
} this->theme->splits.input.styleSheet);
else
{
this->setStyleSheet(
"QRadioButton { color: #fff } QLabel { color: #fff }");
}
} }
void SelectChannelDialog::addShortcuts() void SelectChannelDialog::addShortcuts()
+13
View File
@@ -14,6 +14,7 @@
#include "messages/search/SubstringPredicate.hpp" #include "messages/search/SubstringPredicate.hpp"
#include "messages/search/SubtierPredicate.hpp" #include "messages/search/SubtierPredicate.hpp"
#include "singletons/Settings.hpp" #include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "singletons/WindowManager.hpp" #include "singletons/WindowManager.hpp"
#include "widgets/helper/ChannelView.hpp" #include "widgets/helper/ChannelView.hpp"
#include "widgets/splits/Split.hpp" #include "widgets/splits/Split.hpp"
@@ -80,6 +81,8 @@ SearchPopup::SearchPopup(QWidget *parent, Split *split)
} }
this->resize(400, 600); this->resize(400, 600);
this->addShortcuts(); this->addShortcuts();
this->themeChangedEvent();
} }
void SearchPopup::addShortcuts() void SearchPopup::addShortcuts()
@@ -212,6 +215,16 @@ bool SearchPopup::eventFilter(QObject *object, QEvent *event)
return false; return false;
} }
void SearchPopup::themeChangedEvent()
{
BasePopup::themeChangedEvent();
// NOTE: This currently overrides the QLineEdit's font size.
// If the dialog is open when the theme is changed, things will look a bit off.
// This can be alleviated by us using a single application-wide style sheet for these things.
this->searchInput_->setStyleSheet(this->theme->splits.input.styleSheet);
}
void SearchPopup::search() void SearchPopup::search()
{ {
if (this->snapshot_.size() == 0) if (this->snapshot_.size() == 0)
+1
View File
@@ -32,6 +32,7 @@ protected:
virtual void updateWindowTitle(); virtual void updateWindowTitle();
void showEvent(QShowEvent *event) override; void showEvent(QShowEvent *event) override;
bool eventFilter(QObject *object, QEvent *event) override; bool eventFilter(QObject *object, QEvent *event) override;
void themeChangedEvent() override;
private: private:
void initLayout(); void initLayout();