mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-10 16:14:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: update custom ui colors

Browse Source
This commit is contained in:
Megamouse 2018-06-29 05:46:25 +02:00 committed by Ivan
parent 124122839d
commit 62cec24235
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/rpcs3_app.cpp
View File

@ -334,8 +334,8 @@ void rpcs3_app::OnChangeStyleSheetRequest(const QString& path)
// main window toolbar slider
"QSlider#sizeSlider { color: #505050; background: " + rgba_tool_bar + "; }"
"QSlider#sizeSlider::handle:horizontal { border: 0em smooth rgba(227, 227, 227, 255); border-radius: .58em; background: #404040; width: 1.2em; margin: -.5em 0; }"
"QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: #5b5b5b; height: .3em; }"
"QSlider#sizeSlider::handle:horizontal { border: 0em smooth " + rgba(gui::mw_tool_bar_color, -13) + " border-radius: .58em; background: " + rgba(gui::mw_tool_icon_color, -27) + " width: 1.2em; margin: -.5em 0; }"
"QSlider#sizeSlider::groove:horizontal { border-radius: .15em; background: " + rgba(gui::mw_tool_icon_color) + " height: .3em; }"
// main window toolbar
"QToolBar#mw_toolbar { background-color: " + rgba_tool_bar + " }"
@ -355,7 +355,7 @@ void rpcs3_app::OnChangeStyleSheetRequest(const QString& path)
"QTableWidget#game_grid { alternate-background-color: #f2f2f2; background-color: rgba(255, 255, 255, 255); font-weight: 600; font-size: 8pt; font-family: Lucida Grande; color: rgba(51, 51, 51, 255); }"
"QTableView::item { border-left: 0.063em solid white; border-right: 0.063em solid white; padding-left:0.313em; }"
"QTableView::item:selected { background-color: #148aff; color: #fff; }"
"QHeaderView::section { padding: .5em; border: 0.063em solid #ffffff; }"
"QHeaderView::section { padding: .5em; border: 0.063em solid #ffffff; font-size: 1.500em; }"
// log frame tty
"QTextEdit#tty_frame { background-color: #ffffff; }"

24
rpcs3/rpcs3qt/main_window.cpp
View File

@ -1098,15 +1098,23 @@ void main_window::RepaintToolbar()
if (guiSettings->GetValue(gui::m_enableUIColors).toBool())
{
QColor tbc = guiSettings->GetValue(gui::mw_toolBarColor).value<QColor>();
QColor tic = guiSettings->GetValue(gui::mw_toolIconColor).value<QColor>();
ui->toolBar->setStyleSheet(gui::stylesheet + QString(
"QToolBar { background-color: rgba(%1, %2, %3, %4); }"
"QToolBar::separator {background-color: rgba(%5, %6, %7, %8); width: 1px; margin-top: 2px; margin-bottom: 2px;}"
"QSlider { background-color: rgba(%1, %2, %3, %4); }"
"QLineEdit { background-color: rgba(%1, %2, %3, %4); }")
.arg(tbc.red()).arg(tbc.green()).arg(tbc.blue()).arg(tbc.alpha())
.arg(tbc.red() - 20).arg(tbc.green() - 20).arg(tbc.blue() - 20).arg(tbc.alpha() - 20)
);
QString tool_bar_color_1 = QString("rgba(%0, %1, %2, %3)").arg(tbc.red()).arg(tbc.green()).arg(tbc.blue()).arg(tbc.alpha());
QString tool_bar_color_2 = QString("rgba(%0, %1, %2, %3)").arg(tbc.red() - 20).arg(tbc.green() - 20).arg(tbc.blue() - 20).arg(tbc.alpha() - 20);
QString tool_icon_color_1 = QString("rgba(%0, %1, %2, %3)").arg(tic.red()).arg(tic.green()).arg(tic.blue()).arg(tic.alpha());
QString tool_icon_color_2 = QString("rgba(%0, %1, %2, %3)").arg(tic.red() - 10).arg(tic.green() - 10).arg(tic.blue() - 10).arg(tic.alpha() - 10);
ui->toolBar->setStyleSheet(gui::stylesheet + QString
(
"QToolBar { background-color: " + tool_bar_color_1 + "; }"
"QToolBar::separator {background-color: " + tool_bar_color_2 + "; width: 1px; margin-top: 2px; margin-bottom: 2px;}"
"QSlider { color: " + tool_bar_color_2 + "; background: " + tool_bar_color_1 + "; }"
"QSlider::handle:horizontal { border: 0em smooth " + tool_bar_color_2 + "; border-radius: .58em; background: " + tool_icon_color_2 + "; width: 1.2em; margin: -.5em 0; }"
"QSlider::groove:horizontal { border-radius: .15em; color: " + tool_icon_color_2 + "; background: " + tool_icon_color_1 + "; height: .3em; }"
"QLineEdit { background-color: " + tool_bar_color_1 + "; }"
));
}
else
{

4
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -938,7 +938,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
}
else
{
button->setIcon(gui::utils::get_colorized_icon(icon, iconColor, color));
button->setIcon(gui::utils::get_colorized_icon(icon, iconColor, color, true));
}
button->setText("");
button->setStyleSheet(styleSheet().append("text-align:left;"));
@ -951,7 +951,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
{
addColoredIcon(ui->pb_gl_icon_color, xgui_settings->GetValue(gui::gl_iconColor).value<QColor>());
addColoredIcon(ui->pb_tool_bar_color, xgui_settings->GetValue(gui::mw_toolBarColor).value<QColor>());
addColoredIcon(ui->pb_tool_icon_color, xgui_settings->GetValue(gui::mw_toolIconColor).value<QColor>(), QIcon(":/Icons/stop.png"), gui::mw_tool_icon_color);
addColoredIcon(ui->pb_tool_icon_color, xgui_settings->GetValue(gui::mw_toolIconColor).value<QColor>());
};
AddColoredIcons();