Skip to content

Editor: TextRender Size can have 4 input fields in Properties #1197 #1198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eprikazchikov merged 1 commit into from
Dec 18, 2025
Merged

Editor: TextRender Size can have 4 input fields in Properties #1197 #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 54 additions & 34 deletions worldeditor/src/screens/propertyedit/custom/vector4/vector4edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

Vector4Edit::Vector4Edit(QWidget *parent) :
PropertyEdit(parent),
ui(new Ui::Vector4Edit) {
ui(new Ui::Vector4Edit),
m_type(0) {

ui->setupUi(this);

Expand Down Expand Up @@ -37,48 +38,67 @@ Vector4Edit::~Vector4Edit() {
}

Variant Vector4Edit::data() const {
switch(m_components) {
case 2: return Vector2(ui->x->text().toFloat(),
ui->y->text().toFloat());
case 3: return Vector3(ui->x->text().toFloat(),
ui->y->text().toFloat(),
ui->z->text().toFloat());
default: return Vector4(ui->x->text().toFloat(),
ui->y->text().toFloat(),
ui->z->text().toFloat(),
ui->w->text().toFloat());
switch(m_type) {
case MetaType::VECTOR2: return Vector2(ui->x->text().toFloat(),
ui->y->text().toFloat());
case MetaType::VECTOR3: return Vector3(ui->x->text().toFloat(),
ui->y->text().toFloat(),
ui->z->text().toFloat());
case MetaType::VECTOR4: return Vector4(ui->x->text().toFloat(),
ui->y->text().toFloat(),
ui->z->text().toFloat(),
ui->w->text().toFloat());
default: break;
}
return Variant();
}

void Vector4Edit::setData(const Variant &data) {
setComponents(data.userType() - MetaType::VECTOR2 + 2);
static const QRegularExpression reg("\\.?0+$");

setComponents(data.userType());

Vector4 v;
switch(m_components) {
case 2: v = Vector4(data.value<Vector2>(), 0.0f, 0.0f); break;
case 3: v = Vector4(data.value<Vector3>(), 0.0f); break;
default: v = data.value<Vector4>(); break;
switch(m_type) {
case MetaType::VECTOR2: {
Vector2 v = data.value<Vector2>();
ui->x->setText(QString::number(v.x, 'f', 4).remove(reg));
ui->y->setText(QString::number(v.y, 'f', 4).remove(reg));
} break;
case MetaType::VECTOR3: {
Vector3 v = data.value<Vector3>();
ui->x->setText(QString::number(v.x, 'f', 4).remove(reg));
ui->y->setText(QString::number(v.y, 'f', 4).remove(reg));
ui->z->setText(QString::number(v.z, 'f', 4).remove(reg));
} break;
case MetaType::VECTOR4: {
v = data.value<Vector4>();
ui->x->setText(QString::number(v.x, 'f', 4).remove(reg));
ui->y->setText(QString::number(v.y, 'f', 4).remove(reg));
ui->z->setText(QString::number(v.z, 'f', 4).remove(reg));
ui->w->setText(QString::number(v.w, 'f', 4).remove(reg));
} break;
default: break;
}

QRegularExpression reg("\\.?0+$");
ui->x->setText(QString::number(v.x, 'f', 4).remove(reg));
ui->y->setText(QString::number(v.y, 'f', 4).remove(reg));
ui->z->setText(QString::number(v.z, 'f', 4).remove(reg));
ui->w->setText(QString::number(v.w, 'f', 4).remove(reg));
}

void Vector4Edit::setComponents(uint8_t value) {
if(m_components != value) {
m_components = value;
ui->z->show();
ui->w->show();

if(value <= 3) {
ui->w->hide();
}

if(value <= 2) {
ui->z->hide();
void Vector4Edit::setComponents(uint32_t type) {
if(m_type != type) {
m_type = type;

switch(m_type) {
case MetaType::VECTOR2: {
ui->z->hide();
ui->w->hide();
} break;
case MetaType::VECTOR3: {
ui->z->show();
ui->w->hide();
} break;
default: {
ui->z->show();
ui->w->show();
} break;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions worldeditor/src/screens/propertyedit/custom/vector4/vector4edit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ class Vector4Edit : public PropertyEdit {
private:
bool eventFilter(QObject *obj, QEvent *event) override;

void setComponents(uint8_t value);
void setComponents(uint32_t value);

private:
Ui::Vector4Edit *ui;

int m_components;
uint32_t m_type;

};

Expand Down
Loading