mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 12:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: use default colors for native styles

Browse Source
This commit is contained in:
Megamouse 2023-12-22 03:25:19 +01:00
parent bc9f0fe56c
commit 50214a6a07
16 changed files with 98 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/rpcs3qt/debugger_frame.cpp
View File

@ -199,10 +199,12 @@ void debugger_frame::ChangeColors() const
{ {
if (m_debugger_list) if (m_debugger_list)
{ {
m_debugger_list->m_color_bp = m_breakpoint_list->m_color_bp = gui::utils::get_label_color("debugger_frame_breakpoint", QPalette::Window); const QColor color = gui::utils::get_foreground_color();
m_debugger_list->m_color_pc = gui::utils::get_label_color("debugger_frame_pc", QPalette::Window);
m_debugger_list->m_text_color_bp = m_breakpoint_list->m_text_color_bp = gui::utils::get_label_color("debugger_frame_breakpoint"); m_debugger_list->m_color_bp = m_breakpoint_list->m_color_bp = gui::utils::get_label_color("debugger_frame_breakpoint", Qt::yellow, Qt::darkYellow, QPalette::Window);
m_debugger_list->m_text_color_pc = gui::utils::get_label_color("debugger_frame_pc"); m_debugger_list->m_color_pc = gui::utils::get_label_color("debugger_frame_pc", Qt::green, Qt::darkGreen, QPalette::Window);
m_debugger_list->m_text_color_bp = m_breakpoint_list->m_text_color_bp = gui::utils::get_label_color("debugger_frame_breakpoint", color, color);
m_debugger_list->m_text_color_pc = gui::utils::get_label_color("debugger_frame_pc", color, color);
} }
} }

2
rpcs3/rpcs3qt/game_list_frame.cpp
View File

@ -2344,7 +2344,7 @@ void game_list_frame::RepaintIcons(const bool& from_settings)
} }
else else
{ {
m_icon_color = gui::utils::get_label_color("gamelist_icon_background_color"); m_icon_color = gui::utils::get_label_color("gamelist_icon_background_color", Qt::transparent, Qt::transparent);
} }
} }

7
rpcs3/rpcs3qt/gui_application.cpp
View File

@ -37,6 +37,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QTextDocument> #include <QTextDocument>
#include <QStyleFactory> #include <QStyleFactory>
#include <QStyleHints>
#include <clocale> #include <clocale>
@ -293,6 +294,8 @@ void gui_application::InitializeConnects()
connect(this, &gui_application::OnEmulatorReady, m_main_window, &main_window::OnEmuReady); connect(this, &gui_application::OnEmulatorReady, m_main_window, &main_window::OnEmuReady);
connect(this, &gui_application::OnEnableDiscEject, m_main_window, &main_window::OnEnableDiscEject); connect(this, &gui_application::OnEnableDiscEject, m_main_window, &main_window::OnEnableDiscEject);
connect(this, &gui_application::OnEnableDiscInsert, m_main_window, &main_window::OnEnableDiscInsert); connect(this, &gui_application::OnEnableDiscInsert, m_main_window, &main_window::OnEnableDiscInsert);
connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, [this](){ OnChangeStyleSheetRequest(); });
} }
#ifdef WITH_DISCORD_RPC #ifdef WITH_DISCORD_RPC
@ -789,11 +792,13 @@ void gui_application::OnChangeStyleSheetRequest()
}; };
gui_log.notice("Changing stylesheet to '%s'", stylesheet_name); gui_log.notice("Changing stylesheet to '%s'", stylesheet_name);
gui::custom_stylesheet_active = false;
if (stylesheet_name.isEmpty() || stylesheet_name == gui::DefaultStylesheet) if (stylesheet_name.isEmpty() || stylesheet_name == gui::DefaultStylesheet)
{ {
gui_log.notice("Using default stylesheet"); gui_log.notice("Using default stylesheet");
setStyleSheet(gui::stylesheets::default_style_sheet); setStyleSheet(gui::stylesheets::default_style_sheet);
gui::custom_stylesheet_active = true;
} }
else if (stylesheet_name == gui::NoStylesheet) else if (stylesheet_name == gui::NoStylesheet)
{ {
@ -871,6 +876,8 @@ void gui_application::OnChangeStyleSheetRequest()
gui_log.error("Could not find stylesheet '%s'. Using default.", stylesheet_name); gui_log.error("Could not find stylesheet '%s'. Using default.", stylesheet_name);
setStyleSheet(gui::stylesheets::default_style_sheet); setStyleSheet(gui::stylesheets::default_style_sheet);
} }
gui::custom_stylesheet_active = true;
} }
gui::stylesheet = styleSheet(); gui::stylesheet = styleSheet();

1
rpcs3/rpcs3qt/gui_settings.cpp
View File

@ -16,6 +16,7 @@ LOG_CHANNEL(cfg_log, "CFG");
namespace gui namespace gui
{ {
QString stylesheet; QString stylesheet;
bool custom_stylesheet_active = false;
QString get_game_list_column_name(game_list_columns col) QString get_game_list_column_name(game_list_columns col)
{ {

1
rpcs3/rpcs3qt/gui_settings.h
View File

@ -12,6 +12,7 @@
namespace gui namespace gui
{ {
extern QString stylesheet; extern QString stylesheet;
extern bool custom_stylesheet_active;
enum custom_roles enum custom_roles
{ {

22
rpcs3/rpcs3qt/log_frame.cpp
View File

@ -484,18 +484,20 @@ void log_frame::RepaintTextColors()
QList<QColor> old_colors = m_color; QList<QColor> old_colors = m_color;
QColor old_stack_color = m_color_stack; QColor old_stack_color = m_color_stack;
const QColor color = gui::utils::get_foreground_color();
// Get text color. Do this once to prevent possible slowdown // Get text color. Do this once to prevent possible slowdown
m_color.clear(); m_color.clear();
m_color.append(gui::utils::get_label_color("log_level_always")); m_color.append(gui::utils::get_label_color("log_level_always", Qt::darkCyan, Qt::cyan));
m_color.append(gui::utils::get_label_color("log_level_fatal")); m_color.append(gui::utils::get_label_color("log_level_fatal", Qt::darkMagenta, Qt::magenta));
m_color.append(gui::utils::get_label_color("log_level_error")); m_color.append(gui::utils::get_label_color("log_level_error", Qt::red, Qt::red));
m_color.append(gui::utils::get_label_color("log_level_todo")); m_color.append(gui::utils::get_label_color("log_level_todo", Qt::darkYellow, Qt::darkYellow));
m_color.append(gui::utils::get_label_color("log_level_success")); m_color.append(gui::utils::get_label_color("log_level_success", Qt::darkGreen, Qt::green));
m_color.append(gui::utils::get_label_color("log_level_warning")); m_color.append(gui::utils::get_label_color("log_level_warning", Qt::darkYellow, Qt::darkYellow));
m_color.append(gui::utils::get_label_color("log_level_notice")); m_color.append(gui::utils::get_label_color("log_level_notice", color, color));
m_color.append(gui::utils::get_label_color("log_level_trace")); m_color.append(gui::utils::get_label_color("log_level_trace", color, color));
m_color_stack = gui::utils::get_label_color("log_stack"); m_color_stack = gui::utils::get_label_color("log_stack", color, color);
// Use new colors if the old colors weren't set yet // Use new colors if the old colors weren't set yet
if (old_colors.empty()) if (old_colors.empty())
@ -511,7 +513,7 @@ void log_frame::RepaintTextColors()
// Repaint TTY with new colors // Repaint TTY with new colors
QTextCursor tty_cursor = m_tty->textCursor(); QTextCursor tty_cursor = m_tty->textCursor();
QTextCharFormat text_format = tty_cursor.charFormat(); QTextCharFormat text_format = tty_cursor.charFormat();
text_format.setForeground(gui::utils::get_label_color("tty_text")); text_format.setForeground(gui::utils::get_label_color("tty_text", color, color));
tty_cursor.setCharFormat(text_format); tty_cursor.setCharFormat(text_format);
m_tty->setTextCursor(tty_cursor); m_tty->setTextCursor(tty_cursor);

25
rpcs3/rpcs3qt/main_window.cpp
View File

@ -1684,7 +1684,8 @@ void main_window::SaveWindowState() const
void main_window::RepaintThumbnailIcons() void main_window::RepaintThumbnailIcons()
{ {
[[maybe_unused]] const QColor new_color = gui::utils::get_label_color("thumbnail_icon_color"); const QColor color = gui::utils::get_foreground_color();
[[maybe_unused]] const QColor new_color = gui::utils::get_label_color("thumbnail_icon_color", color, color);
[[maybe_unused]] const auto icon = [&new_color](const QString& path) [[maybe_unused]] const auto icon = [&new_color](const QString& path)
{ {
@ -1707,23 +1708,13 @@ void main_window::RepaintThumbnailIcons()
void main_window::RepaintToolBarIcons() void main_window::RepaintToolBarIcons()
{ {
const QColor color = gui::utils::get_foreground_color();
std::map<QIcon::Mode, QColor> new_colors{}; std::map<QIcon::Mode, QColor> new_colors{};
new_colors[QIcon::Normal] = gui::utils::get_label_color("toolbar_icon_color"); new_colors[QIcon::Normal] = gui::utils::get_label_color("toolbar_icon_color", color, color);
new_colors[QIcon::Disabled] = gui::utils::get_label_color("toolbar_icon_color_disabled", Qt::gray, Qt::lightGray);
const QString sheet = static_cast<QApplication *>(QCoreApplication::instance())->styleSheet(); new_colors[QIcon::Active] = gui::utils::get_label_color("toolbar_icon_color_active", color, color);
new_colors[QIcon::Selected] = gui::utils::get_label_color("toolbar_icon_color_selected", color, color);
if (sheet.contains("toolbar_icon_color_disabled"))
{
new_colors[QIcon::Disabled] = gui::utils::get_label_color("toolbar_icon_color_disabled");
}
if (sheet.contains("toolbar_icon_color_active"))
{
new_colors[QIcon::Active] = gui::utils::get_label_color("toolbar_icon_color_active");
}
if (sheet.contains("toolbar_icon_color_selected"))
{
new_colors[QIcon::Selected] = gui::utils::get_label_color("toolbar_icon_color_selected");
}
const auto icon = [&new_colors](const QString& path) const auto icon = [&new_colors](const QString& path)
{ {

3
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View File

@ -214,7 +214,8 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr<gui_settings> gui_setti
QPainter painter(&controller_pixmap); QPainter painter(&controller_pixmap);
painter.setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing | QPainter::SmoothPixmapTransform); painter.setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
renderer.render(&painter, controller_pixmap.rect()); renderer.render(&painter, controller_pixmap.rect());
ui->l_controller->setPixmap(gui::utils::get_colorized_pixmap(controller_pixmap, QColor(), gui::utils::get_label_color("l_controller"), false, true)); const QColor color = gui::utils::get_foreground_color();
ui->l_controller->setPixmap(gui::utils::get_colorized_pixmap(controller_pixmap, QColor(), gui::utils::get_label_color("l_controller", color, color), false, true));
// Show default widgets first in order to calculate the required size for the scroll area (see pad_settings_dialog::ResizeDialog) // Show default widgets first in order to calculate the required size for the scroll area (see pad_settings_dialog::ResizeDialog)
ui->left_stack->setCurrentIndex(0); ui->left_stack->setCurrentIndex(0);

8
rpcs3/rpcs3qt/patch_creator_dialog.cpp
View File

@ -32,8 +32,8 @@ patch_creator_dialog::patch_creator_dialog(QWidget* parent)
: QDialog(parent) : QDialog(parent)
, ui(new Ui::patch_creator_dialog) , ui(new Ui::patch_creator_dialog)
, mMonoFont(QFontDatabase::systemFont(QFontDatabase::FixedFont)) , mMonoFont(QFontDatabase::systemFont(QFontDatabase::FixedFont))
, mValidColor(gui::utils::get_label_color("log_level_success")) , mValidColor(gui::utils::get_label_color("log_level_success", Qt::darkGreen, Qt::green))
, mInvalidColor(gui::utils::get_label_color("log_level_error")) , mInvalidColor(gui::utils::get_label_color("log_level_error", Qt::red, Qt::red))
, m_offset_validator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?[a-fA-F0-9]{0,8}$"), this)) , m_offset_validator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?[a-fA-F0-9]{0,8}$"), this))
{ {
ui->setupUi(this); ui->setupUi(this);
@ -120,7 +120,7 @@ void patch_creator_dialog::init_patch_type_bombo_box(QComboBox* combo_box, patch
} }
} }
QComboBox* patch_creator_dialog::create_patch_type_bombo_box(patch_type set_type) QComboBox* patch_creator_dialog::create_patch_type_bombo_box(patch_type set_type) const
{ {
QComboBox* combo_box = new QComboBox; QComboBox* combo_box = new QComboBox;
init_patch_type_bombo_box(combo_box, set_type, true); init_patch_type_bombo_box(combo_box, set_type, true);
@ -208,7 +208,7 @@ void patch_creator_dialog::show_table_menu(const QPoint& pos)
menu.exec(ui->instructionTable->viewport()->mapToGlobal(pos)); menu.exec(ui->instructionTable->viewport()->mapToGlobal(pos));
} }
void patch_creator_dialog::update_validator(int index, QComboBox* combo_box, QLineEdit* line_edit) void patch_creator_dialog::update_validator(int index, QComboBox* combo_box, QLineEdit* line_edit) const
{ {
if (index < 0 || !combo_box || !line_edit || !combo_box->itemData(index).canConvert<patch_type>()) if (index < 0 || !combo_box || !line_edit || !combo_box->itemData(index).canConvert<patch_type>())
{ {

4
rpcs3/rpcs3qt/patch_creator_dialog.h
View File

@ -39,9 +39,9 @@ private:
bool can_move_instructions(QModelIndexList& selection, move_direction dir); bool can_move_instructions(QModelIndexList& selection, move_direction dir);
static void init_patch_type_bombo_box(QComboBox* combo_box, patch_type set_type, bool searchable); static void init_patch_type_bombo_box(QComboBox* combo_box, patch_type set_type, bool searchable);
QComboBox* create_patch_type_bombo_box(patch_type set_type); QComboBox* create_patch_type_bombo_box(patch_type set_type) const;
void update_validator(int index, QComboBox* combo_box, QLineEdit* line_edit); void update_validator(int index, QComboBox* combo_box, QLineEdit* line_edit) const;
private Q_SLOTS: private Q_SLOTS:
void show_table_menu(const QPoint& pos); void show_table_menu(const QPoint& pos);

30
rpcs3/rpcs3qt/qt_utils.cpp
View File

@ -174,9 +174,28 @@ namespace gui
} }
return res; return res;
} }
QColor get_label_color(const QString& object_name, QPalette::ColorRole color_role) QColor get_foreground_color()
{ {
QLabel dummy_color;
dummy_color.ensurePolished();
return dummy_color.palette().color(QPalette::ColorRole::WindowText);
}
QColor get_background_color()
{
QLabel dummy_color;
dummy_color.ensurePolished();
return dummy_color.palette().color(QPalette::ColorRole::Window);
}
QColor get_label_color(const QString& object_name, const QColor& fallback_light, const QColor& fallback_dark, QPalette::ColorRole color_role)
{
if (!gui::custom_stylesheet_active || !gui::stylesheet.contains(object_name))
{
return dark_mode_active() ? fallback_dark : fallback_light;
}
QLabel dummy_color; QLabel dummy_color;
dummy_color.setObjectName(object_name); dummy_color.setObjectName(object_name);
dummy_color.ensurePolished(); dummy_color.ensurePolished();
@ -200,7 +219,7 @@ namespace gui
QColor get_link_color(const QString& name) QColor get_link_color(const QString& name)
{ {
return gui::utils::get_label_color(name); return gui::utils::get_label_color(name, QColor(0, 116, 231), QColor(135, 206, 250));
} }
QString get_link_color_string(const QString& name) QString get_link_color_string(const QString& name)
@ -210,11 +229,6 @@ namespace gui
QString get_link_style(const QString& name) QString get_link_style(const QString& name)
{ {
if (!gui::stylesheet.contains(name))
{
return {};
}
return QString("style=\"color: %0;\"").arg(get_link_color_string(name)); return QString("style=\"color: %0;\"").arg(get_link_color_string(name));
} }

20
rpcs3/rpcs3qt/qt_utils.h
View File

@ -13,6 +13,8 @@
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include <QPainter> #include <QPainter>
#include <QFutureWatcher> #include <QFutureWatcher>
#include <QGuiApplication>
#include <QStyleHints>
#include <string> #include <string>
#include <map> #include <map>
@ -65,8 +67,14 @@ namespace gui
// Returns a list of all base names of files in dir whose complete file names contain one of the given name_filters // Returns a list of all base names of files in dir whose complete file names contain one of the given name_filters
QStringList get_dir_entries(const QDir& dir, const QStringList& name_filters, bool full_path = false); QStringList get_dir_entries(const QDir& dir, const QStringList& name_filters, bool full_path = false);
// Returns the foreground color of QLabel with respect to the current light/dark mode.
QColor get_foreground_color();
// Returns the background color of QLabel with respect to the current light/dark mode.
QColor get_background_color();
// Returns the color specified by its color_role for the QLabels with object_name // Returns the color specified by its color_role for the QLabels with object_name
QColor get_label_color(const QString& object_name, QPalette::ColorRole color_role = QPalette::WindowText); QColor get_label_color(const QString& object_name, const QColor& fallback_light, const QColor& fallback_dark, QPalette::ColorRole color_role = QPalette::WindowText);
// Returns the font of the QLabels with object_name // Returns the font of the QLabels with object_name
QFont get_label_font(const QString& object_name); QFont get_label_font(const QString& object_name);
@ -139,6 +147,16 @@ namespace gui
// Convert an arbitrary count of bytes to a readable format using global units (KB, MB...) // Convert an arbitrary count of bytes to a readable format using global units (KB, MB...)
QString format_byte_size(usz size); QString format_byte_size(usz size);
static Qt::ColorScheme color_scheme()
{
return QGuiApplication::styleHints()->colorScheme();
}
static bool dark_mode_active()
{
return color_scheme() == Qt::ColorScheme::Dark;
}
template <typename T> template <typename T>
void stop_future_watcher(QFutureWatcher<T>& watcher, bool cancel, std::shared_ptr<atomic_t<bool>> cancel_flag = nullptr) void stop_future_watcher(QFutureWatcher<T>& watcher, bool cancel, std::shared_ptr<atomic_t<bool>> cancel_flag = nullptr)
{ {

2
rpcs3/rpcs3qt/save_manager_dialog.cpp
View File

@ -310,7 +310,7 @@ void save_manager_dialog::UpdateList()
} }
else else
{ {
m_icon_color = gui::utils::get_label_color("save_manager_icon_background_color"); m_icon_color = gui::utils::get_label_color("save_manager_icon_background_color", Qt::transparent, Qt::transparent);
} }
QPixmap placeholder(320, 176); QPixmap placeholder(320, 176);

18
rpcs3/rpcs3qt/syntax_highlighter.cpp
View File

@ -55,14 +55,16 @@ void Highlighter::highlightBlock(const QString &text)
LogHighlighter::LogHighlighter(QTextDocument* parent) : Highlighter(parent) LogHighlighter::LogHighlighter(QTextDocument* parent) : Highlighter(parent)
{ {
//addRule("^[^·].*$", gui::utils::get_label_color("log_level_always")); // unused for now const QColor color = gui::utils::get_foreground_color();
addRule("^·F.*$", gui::utils::get_label_color("log_level_fatal"));
addRule("^·E.*$", gui::utils::get_label_color("log_level_error")); //addRule("^[^·].*$", gui::utils::get_label_color("log_level_always", Qt::darkCyan, Qt::cyan)); // unused for now
addRule("^·U.*$", gui::utils::get_label_color("log_level_todo")); addRule("^·F.*$", gui::utils::get_label_color("log_level_fatal", Qt::darkMagenta, Qt::magenta));
addRule("^·S.*$", gui::utils::get_label_color("log_level_success")); addRule("^·E.*$", gui::utils::get_label_color("log_level_error", Qt::red, Qt::red));
addRule("^·W.*$", gui::utils::get_label_color("log_level_warning")); addRule("^·U.*$", gui::utils::get_label_color("log_level_todo", Qt::darkYellow, Qt::darkYellow));
addRule("^·!.*$", gui::utils::get_label_color("log_level_notice")); addRule("^·S.*$", gui::utils::get_label_color("log_level_success", Qt::darkGreen, Qt::green));
addRule("^·T.*$", gui::utils::get_label_color("log_level_trace")); addRule("^·W.*$", gui::utils::get_label_color("log_level_warning", Qt::darkYellow, Qt::darkYellow));
addRule("^·!.*$", gui::utils::get_label_color("log_level_notice", color, color));
addRule("^·T.*$", gui::utils::get_label_color("log_level_trace", color, color));
} }
AsmHighlighter::AsmHighlighter(QTextDocument *parent) : Highlighter(parent) AsmHighlighter::AsmHighlighter(QTextDocument *parent) : Highlighter(parent)

2
rpcs3/rpcs3qt/trophy_manager_dialog.cpp
View File

@ -493,7 +493,7 @@ void trophy_manager_dialog::RepaintUI(bool restore_layout)
} }
else else
{ {
m_game_icon_color = gui::utils::get_label_color("trophy_manager_icon_background_color"); m_game_icon_color = gui::utils::get_label_color("trophy_manager_icon_background_color", Qt::transparent, Qt::transparent);
} }
PopulateGameTable(); PopulateGameTable();

9
rpcs3/rpcs3qt/welcome_dialog.cpp
View File

@ -10,13 +10,6 @@
#include <QPushButton> #include <QPushButton>
#include <QCheckBox> #include <QCheckBox>
#include <QSvgWidget> #include <QSvgWidget>
#include <QStyleHints>
#include <QGuiApplication>
static bool recommend_dark_theme()
{
return QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark;
}
welcome_dialog::welcome_dialog(std::shared_ptr<gui_settings> gui_settings, bool is_manual_show, QWidget* parent) welcome_dialog::welcome_dialog(std::shared_ptr<gui_settings> gui_settings, bool is_manual_show, QWidget* parent)
: QDialog(parent) : QDialog(parent)
@ -33,7 +26,7 @@ welcome_dialog::welcome_dialog(std::shared_ptr<gui_settings> gui_settings, bool
ui->i_have_read->setEnabled(!is_manual_show); ui->i_have_read->setEnabled(!is_manual_show);
ui->do_not_show->setEnabled(!is_manual_show); ui->do_not_show->setEnabled(!is_manual_show);
ui->do_not_show->setChecked(!m_gui_settings->GetValue(gui::ib_show_welcome).toBool()); ui->do_not_show->setChecked(!m_gui_settings->GetValue(gui::ib_show_welcome).toBool());
ui->use_dark_theme->setChecked(recommend_dark_theme()); ui->use_dark_theme->setChecked(gui::utils::dark_mode_active());
ui->icon_label->load(QStringLiteral(":/rpcs3.svg")); ui->icon_label->load(QStringLiteral(":/rpcs3.svg"));
ui->label_3->setText(tr( ui->label_3->setText(tr(
R"( R"(