Prechádzať zdrojové kódy

Revert "UI: Move "Add [transition]" to bottom of combo"

This reverts commit 6460579fb69c6b42db42f47aa6b94972ee0c49dc.
gxalpha 3 rokov pred
rodič
commit
4feabf227f
1 zmenil súbory, kde vykonal 9 pridanie a 19 odobranie
  1. 9 19
      UI/window-basic-main-transitions.cpp

+ 9 - 19
UI/window-basic-main-transitions.cpp

@@ -51,14 +51,8 @@ static inline QString MakeQuickTransitionText(QuickTransition *qt)
 
 void OBSBasic::InitDefaultTransitions()
 {
-	struct AddTransitionVal {
-		QString id;
-		QString name;
-	};
-
 	ui->transitions->blockSignals(true);
 	std::vector<OBSSource> transitions;
-	std::vector<AddTransitionVal> addables;
 	size_t idx = 0;
 	const char *id;
 
@@ -78,26 +72,22 @@ void OBSBasic::InitDefaultTransitions()
 			else if (strcmp(id, "cut_transition") == 0)
 				cutTransition = tr;
 		} else {
-			AddTransitionVal val;
-			val.name = QTStr("Add") + QStringLiteral(": ") +
-				   QT_UTF8(name);
-			val.id = QT_UTF8(id);
-			addables.push_back(val);
+			QString addString = QTStr("Add") +
+					    QStringLiteral(": ") +
+					    QT_UTF8(name);
+			ui->transitions->addItem(
+				addString,
+				QVariant::fromValue(QString(QT_UTF8(id))));
 		}
 	}
 
+	if (ui->transitions->count())
+		ui->transitions->insertSeparator(ui->transitions->count());
+
 	for (OBSSource &tr : transitions) {
 		ui->transitions->addItem(QT_UTF8(obs_source_get_name(tr)),
 					 QVariant::fromValue(OBSSource(tr)));
 	}
-
-	if (addables.size())
-		ui->transitions->insertSeparator(ui->transitions->count());
-
-	for (AddTransitionVal &val : addables) {
-		ui->transitions->addItem(val.name, QVariant::fromValue(val.id));
-	}
-
 	ui->transitions->blockSignals(false);
 }