kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 13:30:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed regression introduced in rev1657: key strokes were discarded when editing texts.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1706 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-04-28 23:22:34 +00:00
parent f40560a041
commit f039a37447
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/diagram.cpp
View File

@@ -150,6 +150,7 @@ void Diagram::drawBackground(QPainter *p, const QRectF &r) {
@param e QKeyEvent decrivant l'evenement clavier @param e QKeyEvent decrivant l'evenement clavier
*/ */
void Diagram::keyPressEvent(QKeyEvent *e) { void Diagram::keyPressEvent(QKeyEvent *e) {
bool transmit_event = true;
if (!isReadOnly()) { if (!isReadOnly()) {
QPointF movement; QPointF movement;
switch(e -> key()) { switch(e -> key()) {
@@ -162,9 +163,10 @@ void Diagram::keyPressEvent(QKeyEvent *e) {
beginMoveElements(); beginMoveElements();
continueMoveElements(movement); continueMoveElements(movement);
e -> accept(); e -> accept();
transmit_event = false;
} }
} }
if (!e -> isAccepted()) { if (transmit_event) {
QGraphicsScene::keyPressEvent(e); QGraphicsScene::keyPressEvent(e);
} }
} }
@@ -174,6 +176,7 @@ void Diagram::keyPressEvent(QKeyEvent *e) {
@param e QKeyEvent decrivant l'evenement clavier @param e QKeyEvent decrivant l'evenement clavier
*/ */
void Diagram::keyReleaseEvent(QKeyEvent *e) { void Diagram::keyReleaseEvent(QKeyEvent *e) {
bool transmit_event = true;
if (!isReadOnly()) { if (!isReadOnly()) {
// detecte le relachement d'une touche de direction ( = deplacement d'elements) // detecte le relachement d'une touche de direction ( = deplacement d'elements)
if ( if (
@@ -182,10 +185,11 @@ void Diagram::keyReleaseEvent(QKeyEvent *e) {
!e -> isAutoRepeat() !e -> isAutoRepeat()
) { ) {
endMoveElements(); endMoveElements();
e->accept(); e -> accept();
transmit_event = false;
} }
} }
if (!e -> isAccepted()) { if (transmit_event) {
QGraphicsScene::keyReleaseEvent(e); QGraphicsScene::keyReleaseEvent(e);
} }
} }