From 8576a3a9d2041f8027a2e0ba3cebbc9fb47fa3ea Mon Sep 17 00:00:00 2001 From: xavierqet Date: Fri, 21 Dec 2007 23:53:36 +0000 Subject: [PATCH] Correction d'un bug lors du double-clic sur un champ de texte isole La barre d'outils de l'editeur d'element peut desormais etre positionnee partout git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@243 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- diagramview.cpp | 10 ++++++---- editor/qetelementeditor.cpp | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/diagramview.cpp b/diagramview.cpp index 262c92ba6..c6aa0edcf 100644 --- a/diagramview.cpp +++ b/diagramview.cpp @@ -948,13 +948,15 @@ void DiagramView::mouseDoubleClickEvent(QMouseEvent *e) { QPointF click_pos = viewportTransform().inverted().map(e -> pos()); // detecte le double-clic sur le cartouche ou les colonnes - if (inset_rect.contains(click_pos) || columns_rect.contains(click_pos)) { - // edite les proprietes du schema - dialogEditInfos(); - } else if (QGraphicsItem *qgi = itemAt(e -> pos())) { + if (QGraphicsItem *qgi = itemAt(e -> pos())) { if (Conductor *c = qgraphicsitem_cast(qgi)) { editConductor(c); + } else { + QGraphicsView::mouseDoubleClickEvent(e); } + } else if (inset_rect.contains(click_pos) || columns_rect.contains(click_pos)) { + // edite les proprietes du schema + dialogEditInfos(); } else { QGraphicsView::mouseDoubleClickEvent(e); } diff --git a/editor/qetelementeditor.cpp b/editor/qetelementeditor.cpp index 88b31bd8e..57e8b1ac3 100644 --- a/editor/qetelementeditor.cpp +++ b/editor/qetelementeditor.cpp @@ -176,7 +176,7 @@ void QETElementEditor::setupActions() { parts_toolbar -> setObjectName("parts"); foreach (QAction *action, parts -> actions()) parts_toolbar -> addAction(action); move -> setChecked(true); - parts_toolbar -> setAllowedAreas(Qt::LeftToolBarArea | Qt::RightToolBarArea); + parts_toolbar -> setAllowedAreas(Qt::AllToolBarAreas); /* QAction *xml_preview = new QAction(QIcon(":/ico/info.png"), tr("XML"), this);