Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add prefix for vector component names
  • Loading branch information
pgilfernandez committed Jan 1, 2026
commit 5a09089a3ae792cf03378c2ca9b64c1a6ae6c5b0
25 changes: 23 additions & 2 deletions src/app/GUI/BoxesList/boxsinglewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ void BoxSingleWidget::mouseMoveEvent(QMouseEvent *event) {
const auto drag = new QDrag(this);
{
const auto prop = static_cast<Property*>(mTarget->getTarget());
const QString name = prop->prp_getName();
const QString name = getDisplayName(prop);
const int nameWidth = QApplication::fontMetrics().horizontalAdvance(name);
QPixmap pixmap(mFillWidget->x() + nameWidth + eSizesUI::widget, height());
render(&pixmap);
Expand Down Expand Up @@ -886,7 +886,7 @@ void BoxSingleWidget::paintEvent(QPaintEvent *) {
}

const QRect textRect(nameX, 0, width() - nameX - eSizesUI::widget, eSizesUI::widget);
const QString& name = prop->prp_getName();
const QString name = getDisplayName(prop);
QTextOption opts(Qt::AlignVCenter);
opts.setWrapMode(QTextOption::NoWrap);
p.drawText(textRect, name, opts);
Expand Down Expand Up @@ -947,6 +947,27 @@ void BoxSingleWidget::switchBoxLockedAction() {
update();
}

QString BoxSingleWidget::getDisplayName(Property* const prop) const {
if(!prop) return QString();

QString name = prop->prp_getName();

const auto rules = mParent->getRulesCollection();
if(rules.fParamRule != SWT_ParamRule::animatedOnly) return name;

const auto vecParent = prop->getFirstAncestor<QPointFAnimator>();
if(!vecParent) return name;
const auto xAnim = vecParent->getXAnimator();
const auto yAnim = vecParent->getYAnimator();
if(!xAnim || !yAnim) return name;
if(prop != xAnim && prop != yAnim) return name;

const auto parentName = vecParent->prp_getName();
if(parentName.isEmpty()) return name;

return parentName + " / " + name;
}

void BoxSingleWidget::updateValueSlidersForQPointFAnimator() {
if(!mTarget) return;
const auto>
Expand Down
2 changes: 2 additions & 0 deletions src/app/GUI/BoxesList/boxsinglewidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ class BoxSingleWidget : public SingleWidget {
void clearAndHideValueAnimators();
void updateValueSlidersForQPointFAnimator();
private:
QString getDisplayName(Property* const prop) const;

ContainerBox *getPromoteTargetGroup();

void clearSelected() { setSelected(false); }
Expand Down
2 changes: 1 addition & 1 deletion src/app/GUI/timelinewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ TimelineWidget::TimelineWidget(Document &document,

paramActionAdder(SWT_ParamRule::all, tr("All"))->setChecked(true);
paramActionAdder(SWT_ParamRule::animated, tr("Animated"));
paramActionAdder(SWT_ParamRule::animatedOnly, tr("Just animated"));
paramActionAdder(SWT_ParamRule::animatedOnly, tr("Animated (plain)"));

settingsMenu->addSeparator();

Expand Down