jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Allow blocking all signals if resetting downscales

Browse Source 
Allows the ability to block all the signals if resetting downscale
values, which will prevent values from triggering a widget update
unintentionally, forcing the user to have to save settings.
This commit is contained in:
jp9000 2020-11-13 17:35:27 -08:00
parent 97491ee91a
commit 4f74ffe993
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UI/window-basic-settings.cpp
View File

@ -1349,7 +1349,8 @@ static const double vals[] = {1.0, 1.25, (1.0 / 0.75), 1.5, (1.0 / 0.6), 1.75,
static const size_t numVals = sizeof(vals) / sizeof(double);
void OBSBasicSettings::ResetDownscales(uint32_t cx, uint32_t cy)
void OBSBasicSettings::ResetDownscales(uint32_t cx, uint32_t cy,
bool ignoreAllSignals)
{
QString advRescale;
QString advRecRescale;
@ -1366,6 +1367,11 @@ void OBSBasicSettings::ResetDownscales(uint32_t cx, uint32_t cy)
ui->outputResolution->blockSignals(true);
if (ignoreAllSignals) {
ui->advOutRescale->blockSignals(true);
ui->advOutRecRescale->blockSignals(true);
ui->advOutFFRescale->blockSignals(true);
}
ui->outputResolution->clear();
ui->advOutRescale->clear();
ui->advOutRecRescale->clear();
@ -1441,6 +1447,12 @@ void OBSBasicSettings::ResetDownscales(uint32_t cx, uint32_t cy)
ui->advOutRescale->lineEdit()->setText(advRescale);
ui->advOutRecRescale->lineEdit()->setText(advRecRescale);
ui->advOutFFRescale->lineEdit()->setText(advFFRescale);
if (ignoreAllSignals) {
ui->advOutRescale->blockSignals(false);
ui->advOutRecRescale->blockSignals(false);
ui->advOutFFRescale->blockSignals(false);
}
}
void OBSBasicSettings::LoadDownscaleFilters()

3
UI/window-basic-settings.hpp
View File

@ -275,7 +275,8 @@ private:
/* video */
void LoadRendererList();
void ResetDownscales(uint32_t cx, uint32_t cy);
void ResetDownscales(uint32_t cx, uint32_t cy,
bool ignoreAllSignals = false);
void LoadDownscaleFilters();
void LoadResolutionLists();
void LoadFPSData();