feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Integrate Edit3D view into Creator

Browse Source 
Edit3D view is now a tab alongside Form Editor.
Buttons were moved to a Creator side task bar on Edit 3D view.

Change-Id: Ia06107e4f855ba512ffea3e628a61558894e800e
Fixes: QDS-1570
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-02-11 11:33:25 +02:00
parent 7eda08f600
commit 4908055937
93 changed files with 2037 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
share/qtcreator/qml/qmlpuppet/commands/update3dviewstatecommand.cpp
View File

@@ -45,6 +45,12 @@ Update3dViewStateCommand::Update3dViewStateCommand(bool active, bool hasPopup)
{
}
Update3dViewStateCommand::Update3dViewStateCommand(const QSize &size)
: m_size(size)
, m_type(Update3dViewStateCommand::SizeChange)
{
}
Qt::WindowStates Update3dViewStateCommand::previousStates() const
{
return m_previousStates;
@@ -65,6 +71,11 @@ bool Update3dViewStateCommand::hasPopup() const
return m_hasPopup;
}
QSize Update3dViewStateCommand::size() const
{
return m_size;
}
Update3dViewStateCommand::Type Update3dViewStateCommand::type() const
{
return m_type;
@@ -77,6 +88,7 @@ QDataStream &operator<<(QDataStream &out, const Update3dViewStateCommand &comman
out << qint32(command.isActive());
out << qint32(command.hasPopup());
out << qint32(command.type());
out << command.size();
return out;
}
@@ -94,13 +106,16 @@ QDataStream &operator>>(QDataStream &in, Update3dViewStateCommand &command)
command.m_active = active;
command.m_hasPopup = hasPopup;
command.m_type = Update3dViewStateCommand::Type(type);
in >> command.m_size;
return in;
}
QDebug operator<<(QDebug debug, const Update3dViewStateCommand &command)
{
return debug.nospace() << "Update3dViewStateCommand(type: " << command.m_type << ")";
return debug.nospace() << "Update3dViewStateCommand(type: "
<< command.m_type << ","
<< command.m_size << ")";
}
} // namespace QmlDesigner