mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 21:37:52 -07:00
Qt: make all tooltips look similar to balloon tips (and share parts of their code)
This commit is contained in:
parent
a45a0a2066
commit
4f53adc331
@ -14,7 +14,6 @@
|
|||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QPainterPath>
|
#include <QPainterPath>
|
||||||
#include <QPropertyAnimation>
|
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
|
|
||||||
@ -31,6 +30,8 @@
|
|||||||
|
|
||||||
#include "Core/Config/MainSettings.h"
|
#include "Core/Config/MainSettings.h"
|
||||||
|
|
||||||
|
#include "DolphinQt/Settings.h"
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
std::unique_ptr<BalloonTip> s_the_balloon_tip = nullptr;
|
std::unique_ptr<BalloonTip> s_the_balloon_tip = nullptr;
|
||||||
@ -73,54 +74,11 @@ BalloonTip::BalloonTip(PrivateTag, const QIcon& icon, QString title, QString mes
|
|||||||
setAttribute(Qt::WA_DeleteOnClose);
|
setAttribute(Qt::WA_DeleteOnClose);
|
||||||
setAutoFillBackground(true);
|
setAutoFillBackground(true);
|
||||||
|
|
||||||
const QPalette& pal = parent->palette();
|
|
||||||
|
|
||||||
const auto theme_window_color = pal.color(QPalette::Base);
|
|
||||||
const auto theme_window_hsv = theme_window_color.toHsv();
|
|
||||||
|
|
||||||
const auto brightness = theme_window_hsv.value();
|
|
||||||
|
|
||||||
QColor window_color;
|
QColor window_color;
|
||||||
QColor text_color;
|
QColor text_color;
|
||||||
QColor dolphin_emphasis;
|
QColor dolphin_emphasis;
|
||||||
const bool use_high_contrast = Config::Get(Config::MAIN_USE_HIGH_CONTRAST_TOOLTIPS);
|
Settings::Instance().GetToolTipStyle(window_color, text_color, dolphin_emphasis, m_border_color,
|
||||||
if (brightness > 128)
|
parent->palette(), palette());
|
||||||
{
|
|
||||||
if (use_high_contrast)
|
|
||||||
{
|
|
||||||
// Our theme color is light, so make it darker
|
|
||||||
window_color = QColor(72, 72, 72);
|
|
||||||
text_color = Qt::white;
|
|
||||||
dolphin_emphasis = Qt::yellow;
|
|
||||||
m_border_color = palette().color(QPalette::Window).darker(160);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
window_color = pal.color(QPalette::Window);
|
|
||||||
text_color = pal.color(QPalette::Text);
|
|
||||||
dolphin_emphasis = QColor(QStringLiteral("#0090ff"));
|
|
||||||
m_border_color = pal.color(QPalette::Text);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (use_high_contrast)
|
|
||||||
{
|
|
||||||
// Our theme color is dark, so make it lighter
|
|
||||||
window_color = Qt::white;
|
|
||||||
text_color = Qt::black;
|
|
||||||
dolphin_emphasis = QColor(QStringLiteral("#0090ff"));
|
|
||||||
m_border_color = palette().color(QPalette::Window).darker(160);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
window_color = pal.color(QPalette::Window);
|
|
||||||
text_color = pal.color(QPalette::Text);
|
|
||||||
dolphin_emphasis = Qt::yellow;
|
|
||||||
m_border_color = pal.color(QPalette::Text);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const auto style_sheet = QStringLiteral("background-color: #%1; color: #%2;")
|
const auto style_sheet = QStringLiteral("background-color: #%1; color: #%2;")
|
||||||
.arg(window_color.rgba(), 0, 16)
|
.arg(window_color.rgba(), 0, 16)
|
||||||
.arg(text_color.rgba(), 0, 16);
|
.arg(text_color.rgba(), 0, 16);
|
||||||
@ -188,6 +146,7 @@ void BalloonTip::UpdateBoundsAndRedraw(const QPoint& pos, ShowArrow show_arrow)
|
|||||||
const QRect screen_rect = screen->geometry();
|
const QRect screen_rect = screen->geometry();
|
||||||
#endif
|
#endif
|
||||||
QSize sh = sizeHint();
|
QSize sh = sizeHint();
|
||||||
|
// The look should resemble the default tooltip style set in Settings::SetCurrentUserStyle()
|
||||||
const int border = 1;
|
const int border = 1;
|
||||||
const int arrow_height = 18;
|
const int arrow_height = 18;
|
||||||
const int arrow_width = 18;
|
const int arrow_width = 18;
|
||||||
|
@ -246,6 +246,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
|
|||||||
DolphinAnalytics::Instance().ReportDolphinStart("qt");
|
DolphinAnalytics::Instance().ReportDolphinStart("qt");
|
||||||
|
|
||||||
MainWindow win{std::move(boot), static_cast<const char*>(options.get("movie"))};
|
MainWindow win{std::move(boot), static_cast<const char*>(options.get("movie"))};
|
||||||
|
Settings::Instance().SetCurrentUserStyle(Settings::Instance().GetCurrentUserStyle());
|
||||||
if (options.is_set("debugger"))
|
if (options.is_set("debugger"))
|
||||||
Settings::Instance().SetDebugModeEnabled(true);
|
Settings::Instance().SetDebugModeEnabled(true);
|
||||||
win.Show();
|
win.Show();
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
#include <QFontDatabase>
|
#include <QFontDatabase>
|
||||||
#include <QSize>
|
#include <QSize>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
#include "AudioCommon/AudioCommon.h"
|
#include "AudioCommon/AudioCommon.h"
|
||||||
|
|
||||||
@ -45,8 +46,6 @@ Settings::Settings()
|
|||||||
|
|
||||||
g_controller_interface.RegisterDevicesChangedCallback(
|
g_controller_interface.RegisterDevicesChangedCallback(
|
||||||
[this] { QueueOnObject(this, [this] { emit DevicesChanged(); }); });
|
[this] { QueueOnObject(this, [this] { emit DevicesChanged(); }); });
|
||||||
|
|
||||||
SetCurrentUserStyle(GetCurrentUserStyle());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Settings::~Settings() = default;
|
Settings::~Settings() = default;
|
||||||
@ -80,10 +79,13 @@ QString Settings::GetCurrentUserStyle() const
|
|||||||
return QFileInfo(GetQSettings().value(QStringLiteral("userstyle/path")).toString()).fileName();
|
return QFileInfo(GetQSettings().value(QStringLiteral("userstyle/path")).toString()).fileName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Calling this before the main window has been created breaks the style of some widgets on
|
||||||
|
// Windows 10/Qt 5.15.0. But only if we set a stylesheet that isn't an empty string.
|
||||||
void Settings::SetCurrentUserStyle(const QString& stylesheet_name)
|
void Settings::SetCurrentUserStyle(const QString& stylesheet_name)
|
||||||
{
|
{
|
||||||
QString stylesheet_contents;
|
QString stylesheet_contents;
|
||||||
|
|
||||||
|
// If we haven't found one, we continue with an empty (default) style
|
||||||
if (!stylesheet_name.isEmpty() && AreUserStylesEnabled())
|
if (!stylesheet_name.isEmpty() && AreUserStylesEnabled())
|
||||||
{
|
{
|
||||||
// Load custom user stylesheet
|
// Load custom user stylesheet
|
||||||
@ -94,6 +96,26 @@ void Settings::SetCurrentUserStyle(const QString& stylesheet_name)
|
|||||||
stylesheet_contents = QString::fromUtf8(stylesheet.readAll().data());
|
stylesheet_contents = QString::fromUtf8(stylesheet.readAll().data());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Define tooltips style if not already defined
|
||||||
|
if (!stylesheet_contents.contains(QStringLiteral("QToolTip"), Qt::CaseSensitive))
|
||||||
|
{
|
||||||
|
const QPalette& palette = qApp->palette();
|
||||||
|
QColor window_color;
|
||||||
|
QColor text_color;
|
||||||
|
QColor unused_text_emphasis_color;
|
||||||
|
QColor border_color;
|
||||||
|
GetToolTipStyle(window_color, text_color, unused_text_emphasis_color, border_color, palette,
|
||||||
|
palette);
|
||||||
|
|
||||||
|
const auto tooltip_stylesheet =
|
||||||
|
QStringLiteral("QToolTip { background-color: #%1; color: #%2; padding: 8px; "
|
||||||
|
"border: 1px; border-style: solid; border-color: #%3; }")
|
||||||
|
.arg(window_color.rgba(), 0, 16)
|
||||||
|
.arg(text_color.rgba(), 0, 16)
|
||||||
|
.arg(border_color.rgba(), 0, 16);
|
||||||
|
stylesheet_contents.append(QStringLiteral("%1").arg(tooltip_stylesheet));
|
||||||
|
}
|
||||||
|
|
||||||
qApp->setStyleSheet(stylesheet_contents);
|
qApp->setStyleSheet(stylesheet_contents);
|
||||||
|
|
||||||
GetQSettings().setValue(QStringLiteral("userstyle/name"), stylesheet_name);
|
GetQSettings().setValue(QStringLiteral("userstyle/name"), stylesheet_name);
|
||||||
@ -109,6 +131,32 @@ void Settings::SetUserStylesEnabled(bool enabled)
|
|||||||
GetQSettings().setValue(QStringLiteral("userstyle/enabled"), enabled);
|
GetQSettings().setValue(QStringLiteral("userstyle/enabled"), enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Settings::GetToolTipStyle(QColor& window_color, QColor& text_color,
|
||||||
|
QColor& emphasis_text_color, QColor& border_color,
|
||||||
|
const QPalette& palette, const QPalette& high_contrast_palette) const
|
||||||
|
{
|
||||||
|
const auto theme_window_color = palette.color(QPalette::Base);
|
||||||
|
const auto theme_window_hsv = theme_window_color.toHsv();
|
||||||
|
const auto brightness = theme_window_hsv.value();
|
||||||
|
const bool brightness_over_threshold = brightness > 128;
|
||||||
|
const QColor emphasis_text_color_1 = Qt::yellow;
|
||||||
|
const QColor emphasis_text_color_2 = QColor(QStringLiteral("#0090ff")); // ~light blue
|
||||||
|
if (Config::Get(Config::MAIN_USE_HIGH_CONTRAST_TOOLTIPS))
|
||||||
|
{
|
||||||
|
window_color = brightness_over_threshold ? QColor(72, 72, 72) : Qt::white;
|
||||||
|
text_color = brightness_over_threshold ? Qt::white : Qt::black;
|
||||||
|
emphasis_text_color = brightness_over_threshold ? emphasis_text_color_1 : emphasis_text_color_2;
|
||||||
|
border_color = high_contrast_palette.color(QPalette::Window).darker(160);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
window_color = palette.color(QPalette::Window);
|
||||||
|
text_color = palette.color(QPalette::Text);
|
||||||
|
emphasis_text_color = brightness_over_threshold ? emphasis_text_color_2 : emphasis_text_color_1;
|
||||||
|
border_color = palette.color(QPalette::Text);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
QStringList Settings::GetPaths() const
|
QStringList Settings::GetPaths() const
|
||||||
{
|
{
|
||||||
QStringList list;
|
QStringList list;
|
||||||
|
@ -54,6 +54,10 @@ public:
|
|||||||
void SetUserStylesEnabled(bool enabled);
|
void SetUserStylesEnabled(bool enabled);
|
||||||
bool AreUserStylesEnabled() const;
|
bool AreUserStylesEnabled() const;
|
||||||
|
|
||||||
|
void GetToolTipStyle(QColor& window_color, QColor& text_color, QColor& emphasis_text_color,
|
||||||
|
QColor& border_color, const QPalette& palette,
|
||||||
|
const QPalette& high_contrast_palette) const;
|
||||||
|
|
||||||
bool IsLogVisible() const;
|
bool IsLogVisible() const;
|
||||||
void SetLogVisible(bool visible);
|
void SetLogVisible(bool visible);
|
||||||
bool IsLogConfigVisible() const;
|
bool IsLogConfigVisible() const;
|
||||||
|
Loading…
Reference in New Issue
Block a user