mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-13 18:04:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

clang-format: Increase column limit from 80 to 120

Browse Source
This commit is contained in:
Ryan Foster
2024-10-04 17:33:58 -04:00
parent 109f64c446
commit a1fbf1015f
736 changed files with 22684 additions and 45435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
UI/window-basic-settings-a11y.cpp
View File

@@ -13,8 +13,7 @@ enum ColorPreset {
static inline QColor color_from_int(long long val)
{
return QColor(val & 0xff, (val >> 8) & 0xff, (val >> 16) & 0xff,
(val >> 24) & 0xff);
return QColor(val & 0xff, (val >> 8) & 0xff, (val >> 16) & 0xff, (val >> 24) & 0xff);
}
static inline long long color_to_int(QColor color)
@@ -23,8 +22,7 @@ static inline long long color_to_int(QColor color)
return ((val & 0xff) << shift);
};
return shift(color.red(), 0) | shift(color.green(), 8) |
shift(color.blue(), 16) | shift(color.alpha(), 24);
return shift(color.red(), 0) | shift(color.green(), 8) | shift(color.blue(), 16) | shift(color.alpha(), 24);
}
QColor OBSBasicSettings::GetColor(uint32_t colorVal, QString label)
@@ -50,12 +48,10 @@ void OBSBasicSettings::LoadA11ySettings(bool presetChange)
preset = config_get_int(config, "Accessibility", "ColorPreset");
bool block = ui->colorPreset->blockSignals(true);
ui->colorPreset->setCurrentIndex(std::min(
preset, (uint32_t)ui->colorPreset->count() - 1));
ui->colorPreset->setCurrentIndex(std::min(preset, (uint32_t)ui->colorPreset->count() - 1));
ui->colorPreset->blockSignals(block);
bool checked = config_get_bool(config, "Accessibility",
"OverrideColors");
bool checked = config_get_bool(config, "Accessibility", "OverrideColors");
ui->colorsGroupBox->setChecked(checked);
}
@@ -81,25 +77,17 @@ void OBSBasicSettings::LoadA11ySettings(bool presetChange)
} else if (preset == COLOR_PRESET_CUSTOM) {
SetDefaultColors();
selectRed =
config_get_int(config, "Accessibility", "SelectRed");
selectGreen =
config_get_int(config, "Accessibility", "SelectGreen");
selectBlue =
config_get_int(config, "Accessibility", "SelectBlue");
selectRed = config_get_int(config, "Accessibility", "SelectRed");
selectGreen = config_get_int(config, "Accessibility", "SelectGreen");
selectBlue = config_get_int(config, "Accessibility", "SelectBlue");
mixerGreen =
config_get_int(config, "Accessibility", "MixerGreen");
mixerYellow =
config_get_int(config, "Accessibility", "MixerYellow");
mixerGreen = config_get_int(config, "Accessibility", "MixerGreen");
mixerYellow = config_get_int(config, "Accessibility", "MixerYellow");
mixerRed = config_get_int(config, "Accessibility", "MixerRed");
mixerGreenActive = config_get_int(config, "Accessibility",
"MixerGreenActive");
mixerYellowActive = config_get_int(config, "Accessibility",
"MixerYellowActive");
mixerRedActive = config_get_int(config, "Accessibility",
"MixerRedActive");
mixerGreenActive = config_get_int(config, "Accessibility", "MixerGreenActive");
mixerYellowActive = config_get_int(config, "Accessibility", "MixerYellowActive");
mixerRedActive = config_get_int(config, "Accessibility", "MixerRedActive");
}
UpdateA11yColors();
@@ -111,8 +99,7 @@ void OBSBasicSettings::SaveA11ySettings()
{
config_t *config = App()->GetUserConfig();
config_set_bool(config, "Accessibility", "OverrideColors",
ui->colorsGroupBox->isChecked());
config_set_bool(config, "Accessibility", "OverrideColors", ui->colorsGroupBox->isChecked());
config_set_int(config, "Accessibility", "ColorPreset", preset);
config_set_int(config, "Accessibility", "SelectRed", selectRed);
@@ -121,12 +108,9 @@ void OBSBasicSettings::SaveA11ySettings()
config_set_int(config, "Accessibility", "MixerGreen", mixerGreen);
config_set_int(config, "Accessibility", "MixerYellow", mixerYellow);
config_set_int(config, "Accessibility", "MixerRed", mixerRed);
config_set_int(config, "Accessibility", "MixerGreenActive",
mixerGreenActive);
config_set_int(config, "Accessibility", "MixerYellowActive",
mixerYellowActive);
config_set_int(config, "Accessibility", "MixerRedActive",
mixerRedActive);
config_set_int(config, "Accessibility", "MixerGreenActive", mixerGreenActive);
config_set_int(config, "Accessibility", "MixerYellowActive", mixerYellowActive);
config_set_int(config, "Accessibility", "MixerRedActive", mixerRedActive);
main->RefreshVolumeColors();
}
@@ -140,10 +124,8 @@ static void SetStyle(QLabel *label, uint32_t colorVal)
label->setText(color.name(QColor::HexRgb));
label->setPalette(palette);
label->setStyleSheet(QString("background-color: %1; color: %2;")
.arg(palette.color(QPalette::Window)
.name(QColor::HexRgb))
.arg(palette.color(QPalette::WindowText)
.name(QColor::HexRgb)));
.arg(palette.color(QPalette::Window).name(QColor::HexRgb))
.arg(palette.color(QPalette::WindowText).name(QColor::HexRgb)));
label->setAutoFillBackground(true);
label->setAlignment(Qt::AlignCenter);
}
@@ -165,23 +147,16 @@ void OBSBasicSettings::SetDefaultColors()
{
config_t *config = App()->GetUserConfig();
config_set_default_int(config, "Accessibility", "SelectRed", selectRed);
config_set_default_int(config, "Accessibility", "SelectGreen",
selectGreen);
config_set_default_int(config, "Accessibility", "SelectBlue",
selectBlue);
config_set_default_int(config, "Accessibility", "SelectGreen", selectGreen);
config_set_default_int(config, "Accessibility", "SelectBlue", selectBlue);
config_set_default_int(config, "Accessibility", "MixerGreen",
mixerGreen);
config_set_default_int(config, "Accessibility", "MixerYellow",
mixerYellow);
config_set_default_int(config, "Accessibility", "MixerGreen", mixerGreen);
config_set_default_int(config, "Accessibility", "MixerYellow", mixerYellow);
config_set_default_int(config, "Accessibility", "MixerRed", mixerRed);
config_set_default_int(config, "Accessibility", "MixerGreenActive",
mixerGreenActive);
config_set_default_int(config, "Accessibility", "MixerYellowActive",
mixerYellowActive);
config_set_default_int(config, "Accessibility", "MixerRedActive",
mixerRedActive);
config_set_default_int(config, "Accessibility", "MixerGreenActive", mixerGreenActive);
config_set_default_int(config, "Accessibility", "MixerYellowActive", mixerYellowActive);
config_set_default_int(config, "Accessibility", "MixerRedActive", mixerRedActive);
}
void OBSBasicSettings::ResetDefaultColors()
@@ -199,16 +174,13 @@ void OBSBasicSettings::ResetDefaultColors()
void OBSBasicSettings::on_colorPreset_currentIndexChanged(int idx)
{
preset = idx == ui->colorPreset->count() - 1 ? COLOR_PRESET_CUSTOM
: idx;
preset = idx == ui->colorPreset->count() - 1 ? COLOR_PRESET_CUSTOM : idx;
LoadA11ySettings(true);
}
void OBSBasicSettings::on_choose1_clicked()
{
QColor color = GetColor(
selectRed,
QTStr("Basic.Settings.Accessibility.ColorOverrides.SelectRed"));
QColor color = GetColor(selectRed, QTStr("Basic.Settings.Accessibility.ColorOverrides.SelectRed"));
if (!color.isValid())
return;
@@ -227,9 +199,7 @@ void OBSBasicSettings::on_choose1_clicked()
void OBSBasicSettings::on_choose2_clicked()
{
QColor color = GetColor(
selectGreen,
QTStr("Basic.Settings.Accessibility.ColorOverrides.SelectGreen"));
QColor color = GetColor(selectGreen, QTStr("Basic.Settings.Accessibility.ColorOverrides.SelectGreen"));
if (!color.isValid())
return;
@@ -248,9 +218,7 @@ void OBSBasicSettings::on_choose2_clicked()
void OBSBasicSettings::on_choose3_clicked()
{
QColor color = GetColor(
selectBlue,
QTStr("Basic.Settings.Accessibility.ColorOverrides.SelectBlue"));
QColor color = GetColor(selectBlue, QTStr("Basic.Settings.Accessibility.ColorOverrides.SelectBlue"));
if (!color.isValid())
return;
@@ -269,9 +237,7 @@ void OBSBasicSettings::on_choose3_clicked()
void OBSBasicSettings::on_choose4_clicked()
{
QColor color = GetColor(
mixerGreen,
QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerGreen"));
QColor color = GetColor(mixerGreen, QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerGreen"));
if (!color.isValid())
return;
@@ -290,9 +256,7 @@ void OBSBasicSettings::on_choose4_clicked()
void OBSBasicSettings::on_choose5_clicked()
{
QColor color = GetColor(
mixerYellow,
QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerYellow"));
QColor color = GetColor(mixerYellow, QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerYellow"));
if (!color.isValid())
return;
@@ -311,9 +275,7 @@ void OBSBasicSettings::on_choose5_clicked()
void OBSBasicSettings::on_choose6_clicked()
{
QColor color = GetColor(
mixerRed,
QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerRed"));
QColor color = GetColor(mixerRed, QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerRed"));
if (!color.isValid())
return;
@@ -332,9 +294,8 @@ void OBSBasicSettings::on_choose6_clicked()
void OBSBasicSettings::on_choose7_clicked()
{
QColor color = GetColor(
mixerGreenActive,
QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerGreenActive"));
QColor color =
GetColor(mixerGreenActive, QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerGreenActive"));
if (!color.isValid())
return;
@@ -353,9 +314,8 @@ void OBSBasicSettings::on_choose7_clicked()
void OBSBasicSettings::on_choose8_clicked()
{
QColor color = GetColor(
mixerYellowActive,
QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerYellowActive"));
QColor color =
GetColor(mixerYellowActive, QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerYellowActive"));
if (!color.isValid())
return;
@@ -374,9 +334,7 @@ void OBSBasicSettings::on_choose8_clicked()
void OBSBasicSettings::on_choose9_clicked()
{
QColor color = GetColor(
mixerRedActive,
QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerRedActive"));
QColor color = GetColor(mixerRedActive, QTStr("Basic.Settings.Accessibility.ColorOverrides.MixerRedActive"));
if (!color.isValid())
return;