SANKORE-564

QT: PDF layer can be moved by using "Arrow"
SANKORE-537
with mask, masking ruler or compass..., the pointer changes of icon when it comes on the tool, but we can't do nothing because it's behind the mask
preferencesAboutTextFull
Anatoly Mihalchenko 13 years ago
parent 6c8c984327
commit a5c7776e3f
  1. 14
      src/board/UBBoardView.cpp
  2. 2
      src/domain/UBGraphicsDelegateFrame.cpp
  3. 1
      src/tools/UBGraphicsCurtainItem.cpp

@ -43,6 +43,8 @@
#include "domain/UBGraphicsTextItem.h" #include "domain/UBGraphicsTextItem.h"
#include "domain/UBGraphicsPixmapItem.h" #include "domain/UBGraphicsPixmapItem.h"
#include "domain/UBGraphicsWidgetItem.h" #include "domain/UBGraphicsWidgetItem.h"
#include "domain/UBGraphicsPDFItem.h"
#include "domain/UBGraphicsPolygonItem.h"
#include "domain/UBItem.h" #include "domain/UBItem.h"
#include "document/UBDocumentProxy.h" #include "document/UBDocumentProxy.h"
@ -50,6 +52,9 @@
#include "customWidgets/UBDraggableLabel.h" #include "customWidgets/UBDraggableLabel.h"
#include "customWidgets/UBDraggableMedia.h" #include "customWidgets/UBDraggableMedia.h"
#include "tools/UBGraphicsCompass.h"
#include "tools/UBGraphicsCache.h"
#include "core/memcheck.h" #include "core/memcheck.h"
UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent) UBBoardView::UBBoardView (UBBoardController* pController, QWidget* pParent)
@ -422,9 +427,12 @@ UBBoardView::mousePressEvent (QMouseEvent *event)
if (!movingItem if (!movingItem
|| movingItem->isSelected() || movingItem->isSelected()
|| (movingItem->type() == UBGraphicsDelegateFrame::Type || movingItem->type() == UBGraphicsDelegateFrame::Type
|| movingItem->type() == DelegateButton::Type) || movingItem->type() == DelegateButton::Type
|| existingTools.contains(movingItem)) || movingItem->type() == UBGraphicsCompass::Type
|| movingItem->type() == UBGraphicsPDFItem::Type
|| movingItem->type() == UBGraphicsPolygonItem::Type
|| movingItem->type() == UBGraphicsCache::Type)
{ {
movingItem = NULL; movingItem = NULL;
QGraphicsView::mousePressEvent (event); QGraphicsView::mousePressEvent (event);

@ -84,6 +84,8 @@ UBGraphicsDelegateFrame::UBGraphicsDelegateFrame(UBGraphicsItemDelegate* pDelega
setAntiScale(1.0); setAntiScale(1.0);
positionHandles(); positionHandles();
this->setAcceptHoverEvents(true);
} }

@ -48,6 +48,7 @@ UBGraphicsCurtainItem::UBGraphicsCurtainItem(QGraphicsItem* parent)
setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Tool); setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Tool);
setPen(Qt::NoPen); setPen(Qt::NoPen);
this->setAcceptHoverEvents(true);
} }
UBGraphicsCurtainItem::~UBGraphicsCurtainItem() UBGraphicsCurtainItem::~UBGraphicsCurtainItem()

Loading…
Cancel
Save