Merge branch 'master' into rational_slider

This commit is contained in:
ThomasWilshaw
2021-04-14 12:08:58 +01:00
committed by GitHub
61 changed files with 853 additions and 5364 deletions
@@ -53,7 +53,7 @@ void NodeParamViewArrayWidget::UpdateCounter(const QString& input, int old_size,
{
Q_UNUSED(old_size)
if (input == input_) {
count_lbl_->setText(tr("%1 element(s)").arg(new_size));
count_lbl_->setText(tr("%n element(s)", nullptr, new_size));
}
}
@@ -381,7 +381,7 @@ void NodeParamViewItemBody::Retranslate()
if (ic.IsArray() && ic.element() >= 0) {
// Make the label the array index
i.value().main_label->setText(tr("%n:", nullptr, ic.element()));
i.value().main_label->setText(tr("%1:").arg(ic.element()));
} else {
// Set to the input's name
i.value().main_label->setText(tr("%1:").arg(ic.name()));
@@ -557,7 +557,7 @@ void NodeParamViewWidgetBridge::InputValueChanged(const NodeInput &input, const
void NodeParamViewWidgetBridge::PropertyChanged(const QString& input, const QString &key, const QVariant &value)
{
if (input != input_.input()) {
if (input != input_.input() || (input_.IsArray() && input_.element() == -1)) {
return;
}