forked from qt-creator/qt-creator
789cbfad6c
Bug fixed by avoiding uniting or subtracting QPolygonF with potentially infinite coordinates. The LiveSelectionIndicator now uses a QGraphicsRectItem rather than a QGraphicsPolygonItem and displays only the boundaries of selected objects, not including their children. The SubcomponentMaskLayerItem now works with rectangles and uses a QRegion to determine the area around the current context, converting this to a polygon only as a last step. Reviewed-by: Kai Koehne Task-number: QTCREATORBUG-4559 Change-Id: I266f5387fa67017fc50215282a95b4ee6498be6d (cherry-picked from d03065da2999b8539d8c5160b58d56dd94373d6f in Qt 4.8)
120 lines
3.7 KiB
C++
120 lines
3.7 KiB
C++
/**************************************************************************
|
|
**
|
|
** This file is part of Qt Creator
|
|
**
|
|
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
|
**
|
|
** Contact: Nokia Corporation (info@qt.nokia.com)
|
|
**
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
**
|
|
** This file may be used under the terms of the GNU Lesser General Public
|
|
** License version 2.1 as published by the Free Software Foundation and
|
|
** appearing in the file LICENSE.LGPL included in the packaging of this file.
|
|
** Please review the following information to ensure the GNU Lesser General
|
|
** Public License version 2.1 requirements will be met:
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** Other Usage
|
|
**
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
**
|
|
** If you have questions regarding the use of this file, please contact
|
|
** Nokia at qt-info@nokia.com.
|
|
**
|
|
**************************************************************************/
|
|
|
|
#include "subcomponentmasklayeritem.h"
|
|
#include "qmlobserverconstants.h"
|
|
#include "qdeclarativeviewobserver.h"
|
|
#include <QtGui/QPolygonF>
|
|
|
|
namespace QmlJSDebugger {
|
|
|
|
SubcomponentMaskLayerItem::SubcomponentMaskLayerItem(QDeclarativeViewObserver *observer,
|
|
QGraphicsItem *parentItem) :
|
|
QGraphicsPolygonItem(parentItem),
|
|
m_observer(observer),
|
|
m_currentItem(0),
|
|
m_borderRect(new QGraphicsRectItem(this))
|
|
{
|
|
m_borderRect->setRect(0,0,0,0);
|
|
m_borderRect->setPen(QPen(QColor(60, 60, 60), 1));
|
|
m_borderRect->setData(Constants::EditorItemDataKey, QVariant(true));
|
|
|
|
setBrush(QBrush(QColor(160,160,160)));
|
|
setPen(Qt::NoPen);
|
|
}
|
|
|
|
int SubcomponentMaskLayerItem::type() const
|
|
{
|
|
return Constants::EditorItemType;
|
|
}
|
|
|
|
static QRectF resizeRect(const QRectF &newRect, const QRectF &oldRect)
|
|
{
|
|
QRectF result = newRect;
|
|
if (oldRect.left() < newRect.left())
|
|
result.setLeft(oldRect.left());
|
|
|
|
if (oldRect.top() < newRect.top())
|
|
result.setTop(oldRect.top());
|
|
|
|
if (oldRect.right() > newRect.right())
|
|
result.setRight(oldRect.right());
|
|
|
|
if (oldRect.bottom() > newRect.bottom())
|
|
result.setBottom(oldRect.bottom());
|
|
|
|
return result;
|
|
}
|
|
|
|
static QPolygonF regionToPolygon(const QRegion ®ion)
|
|
{
|
|
QPainterPath path;
|
|
foreach (const QRect &rect, region.rects())
|
|
path.addRect(rect);
|
|
return path.toFillPolygon();
|
|
}
|
|
|
|
void SubcomponentMaskLayerItem::setCurrentItem(QGraphicsItem *item)
|
|
{
|
|
QGraphicsItem *prevItem = m_currentItem;
|
|
m_currentItem = item;
|
|
|
|
if (!m_currentItem)
|
|
return;
|
|
|
|
QRect viewRect = m_observer->declarativeView()->rect();
|
|
viewRect = m_observer->declarativeView()->mapToScene(viewRect).boundingRect().toRect();
|
|
|
|
QRectF itemRect = item->boundingRect() | item->childrenBoundingRect();
|
|
itemRect = item->mapRectToScene(itemRect);
|
|
|
|
// if updating the same item as before, resize the rectangle only bigger, not smaller.
|
|
if (prevItem == item && prevItem != 0) {
|
|
m_itemPolyRect = resizeRect(itemRect, m_itemPolyRect);
|
|
} else {
|
|
m_itemPolyRect = itemRect;
|
|
}
|
|
QRectF borderRect = m_itemPolyRect;
|
|
borderRect.adjust(-1, -1, 1, 1);
|
|
m_borderRect->setRect(borderRect);
|
|
|
|
const QRegion externalRegion = QRegion(viewRect).subtracted(m_itemPolyRect.toRect());
|
|
setPolygon(regionToPolygon(externalRegion));
|
|
}
|
|
|
|
QGraphicsItem *SubcomponentMaskLayerItem::currentItem() const
|
|
{
|
|
return m_currentItem;
|
|
}
|
|
|
|
} // namespace QmlJSDebugger
|