Skip to content

Editor: Arrays in Properties looks weird #604 #605

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
Nov 9, 2023
Merged

Editor: Arrays in Properties looks weird #604 #605

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
1 change: 1 addition & 0 deletions worldeditor/res/WorldEditor.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<file>styles/dark/icons/gear.png</file>
<file>styles/dark/icons/console.png</file>
<file>styles/dark/icons/properties.png</file>
<file>styles/dark/icons/minus.png</file>
</qresource>
<qresource prefix="/QML">
<file>qml/Theme.qml</file>
Expand Down
Binary file added worldeditor/res/styles/dark/icons/minus.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion worldeditor/src/screens/propertyedit/custom/array/arrayedit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ ArrayEdit::ArrayEdit(QWidget *parent) :

ui->addButton->setProperty("compact", true);
ui->removeButton->setProperty("compact", true);

m_height = height();
}

ArrayEdit::~ArrayEdit() {
Expand All @@ -40,7 +42,7 @@ void ArrayEdit::setData(const QVariant &data) {
}
m_editors.clear();

int height = 22;
int height = m_height;
int i = 0;
for(auto &it : m_list) {
ArrayElement *element = new ArrayElement(this);
Expand Down
2 changes: 2 additions & 0 deletions worldeditor/src/screens/propertyedit/custom/array/arrayedit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ private slots:

QObject *m_propertyObject;

int m_height;

bool m_dynamic;

};
Expand Down
29 changes: 26 additions & 3 deletions worldeditor/src/screens/propertyedit/custom/array/arrayedit.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,34 @@
<item>
<widget class="QToolButton" name="removeButton">
<property name="text">
<string notr="true">-</string>
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="../../../../../res/WorldEditor.qrc">
<normaloff>:/Style/styles/dark/icons/minus.png</normaloff>:/Style/styles/dark/icons/minus.png</iconset>
</property>
<property name="iconSize">
<size>
<width>12</width>
<height>12</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="addButton">
<property name="text">
<string notr="true">+</string>
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="../../../../../res/WorldEditor.qrc">
<normaloff>:/Style/styles/dark/icons/plus.png</normaloff>:/Style/styles/dark/icons/plus.png</iconset>
</property>
<property name="iconSize">
<size>
<width>12</width>
<height>12</height>
</size>
</property>
</widget>
</item>
Expand All @@ -110,6 +130,9 @@
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<resources>
<include location="../../../../../res/WorldEditor.qrc"/>
<include location="../../../../../res/WorldEditor.qrc"/>
</resources>
<connections/>
</ui>