kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-23 02:10:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

QetShapeItem can be edited via the properties editor dock

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4024 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-06-21 20:16:41 +00:00
parent 33b637e6bf
commit 9c6d362637
11 changed files with 575 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/undocommand/itemresizercommand.cpp
View File

@@ -28,7 +28,7 @@
* @param text text to display
* @param parent undo parent
*/
ItemResizerCommand::ItemResizerCommand (QetGraphicsItem *qgi, qreal &old_, qreal &new_, const QString &text, QUndoCommand *parent):
ItemResizerCommand::ItemResizerCommand (QetGraphicsItem *qgi, const qreal &old_, const qreal &new_, const QString &text, QUndoCommand *parent):
QUndoCommand(parent),
m_qgi (qgi),
m_old_size (old_),
@@ -56,7 +56,7 @@ ItemResizerCommand::~ItemResizerCommand() {}
*/
bool ItemResizerCommand::mergeWith(const QUndoCommand *other)
{
if (id() != other->id()) return false;
if (id() != other->id() || other->childCount()) return false;
ItemResizerCommand const *undo = static_cast<const ItemResizerCommand *>(other);
if (m_qgi != undo->m_qgi) return false;
m_new_size = undo->m_new_size;