From 575d710678f9fe3002117e6ca15b20ba183f8f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 19 Sep 2019 13:13:56 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@596 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/blockview/blockbase.h | 1 + qad/blockview/blockview.cpp | 2 ++ qad/blockview/drawtools.cpp | 1 + 3 files changed, 4 insertions(+) diff --git a/qad/blockview/blockbase.h b/qad/blockview/blockbase.h index 2215651..c88b84d 100644 --- a/qad/blockview/blockbase.h +++ b/qad/blockview/blockbase.h @@ -37,6 +37,7 @@ enum BlockviewItemData { bvidInvalidItem = 1008, // bool bvidDecorText = 1010, // QString bvidBlockDecor = 1011, // bool + bvidDTHandle = 1012, // bool bvidCorrectMove = 1100, // bool }; diff --git a/qad/blockview/blockview.cpp b/qad/blockview/blockview.cpp index d933e80..1e41b4b 100644 --- a/qad/blockview/blockview.cpp +++ b/qad/blockview/blockview.cpp @@ -250,6 +250,7 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) { //qDebug() << mil; while (!mil.isEmpty()) { mm_ci = mil.front(); + if (mm_ci->data(bvidDTHandle).toBool()) return QGraphicsView::eventFilter(o, e); if (mm_ci->data(1008).toBool() || mm_ci->data(1007).toBool()) { mil.pop_front(); } else break; @@ -339,6 +340,7 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) { break; } if (mm_ci->data(1007).toBool()) break; + if (mm_ci->data(bvidDTHandle).toBool()) break; if (mm_cancel) return true; if (me->buttons().testFlag(Qt::LeftButton)) { if (!mm_drag) { diff --git a/qad/blockview/drawtools.cpp b/qad/blockview/drawtools.cpp index f920354..1dd1168 100644 --- a/qad/blockview/drawtools.cpp +++ b/qad/blockview/drawtools.cpp @@ -19,6 +19,7 @@ _DTSizeItem::_DTSizeItem(): QGraphicsObject() { for (int i = 0; i < 8; ++i) { //qDebug() << &(rects[i]); rects[i].setData(1007, true); + rects[i].setData(bvidDTHandle, true); rects[i].setFlag(QGraphicsItem::ItemIgnoresTransformations); rects[i].setZValue(10.); rects[i].setAcceptHoverEvents(true);