diff --git a/sources/editor/elementscene.cpp b/sources/editor/elementscene.cpp index a7e5b3cb1..054d5edb6 100644 --- a/sources/editor/elementscene.cpp +++ b/sources/editor/elementscene.cpp @@ -48,6 +48,7 @@ ElementScene::ElementScene(QETElementEditor *editor, QObject *parent) : element_editor(editor), decorator_(0) { + behavior = Normal; setItemIndexMethod(NoIndex); setGrid(1, 1); initPasteArea(); @@ -63,14 +64,6 @@ ElementScene::~ElementScene() { if (m_event_interface) delete m_event_interface; } -/** - Passe la scene en mode "selection et deplacement de parties" -*/ -void ElementScene::slot_move() { - behavior = Normal; - if (m_event_interface) delete m_event_interface; m_event_interface = nullptr; -} - /** * @brief ElementScene::mouseMoveEvent * @param e @@ -87,7 +80,8 @@ void ElementScene::mouseMoveEvent(QGraphicsSceneMouseEvent *e) { } QPointF event_pos = e -> scenePos(); - if (mustSnapToGrid(e)) event_pos = snapToGrid(event_pos); + if (!e -> modifiers() & Qt::ControlModifier) + event_pos = snapToGrid(event_pos); if (behavior == PasteArea) { QRectF current_rect(paste_area_ -> rect()); @@ -957,16 +951,6 @@ QPointF ElementScene::snapToGrid(QPointF point) { return point; } -/** - @param e Evenement souris - @return true s'il faut utiliser le snap-to-grid - Typiquement, cette methode retourne true si l'evenement souris se produit - sans la touche Ctrl enfoncee. -*/ -bool ElementScene::mustSnapToGrid(QGraphicsSceneMouseEvent *e) { - return(!(e -> modifiers() & Qt::ControlModifier)); -} - /** @return true if \a item1's zValue() is less than \a item2's. */ diff --git a/sources/editor/elementscene.h b/sources/editor/elementscene.h index 524085fb8..67f874aef 100644 --- a/sources/editor/elementscene.h +++ b/sources/editor/elementscene.h @@ -151,13 +151,11 @@ class ElementScene : public QGraphicsScene { ElementContent addContentAtPos(const ElementContent &, const QPointF &, QString * = 0); void addPrimitive(QGraphicsItem *); void initPasteArea(); - bool mustSnapToGrid(QGraphicsSceneMouseEvent *); static bool zValueLessThan(QGraphicsItem *, QGraphicsItem *); QMutex *decorator_lock_; void centerElementToOrigine(); public slots: - void slot_move(); void slot_select(const ElementContent &); void slot_selectAll(); void slot_deselectAll(); diff --git a/sources/editor/elementview.cpp b/sources/editor/elementview.cpp index e728f49d3..4d09018bf 100644 --- a/sources/editor/elementview.cpp +++ b/sources/editor/elementview.cpp @@ -35,7 +35,6 @@ ElementView::ElementView(ElementScene *scene, QWidget *parent) : setTransformationAnchor(QGraphicsView::AnchorUnderMouse); zoomReset(); connect(scene_, SIGNAL(pasteAreaDefined(const QRectF &)), this, SLOT(pasteAreaDefined(const QRectF &))); - connect(scene_, SIGNAL(partsAdded()), this, SLOT(adjustSceneRect())); connect(scene_, SIGNAL(needZoomFit()), this, SLOT(zoomFit())); } diff --git a/sources/editor/qetelementeditor.cpp b/sources/editor/qetelementeditor.cpp index c6185ad70..993818847 100644 --- a/sources/editor/qetelementeditor.cpp +++ b/sources/editor/qetelementeditor.cpp @@ -486,7 +486,6 @@ void QETElementEditor::slot_updateTitle() { void QETElementEditor::setupInterface() { // editeur ce_scene = new ElementScene(this, this); - ce_scene -> slot_move(); ce_view = new ElementView(ce_scene, this); slot_setRubberBandToView(); setCentralWidget(ce_view);