mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-18 05:00:33 +01:00
Fixed regression introduced in rev1657: key strokes were discarded when editing texts.
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:
@@ -150,6 +150,7 @@ void Diagram::drawBackground(QPainter *p, const QRectF &r) {
|
||||
@param e QKeyEvent decrivant l'evenement clavier
|
||||
*/
|
||||
void Diagram::keyPressEvent(QKeyEvent *e) {
|
||||
bool transmit_event = true;
|
||||
if (!isReadOnly()) {
|
||||
QPointF movement;
|
||||
switch(e -> key()) {
|
||||
@@ -162,9 +163,10 @@ void Diagram::keyPressEvent(QKeyEvent *e) {
|
||||
beginMoveElements();
|
||||
continueMoveElements(movement);
|
||||
e -> accept();
|
||||
transmit_event = false;
|
||||
}
|
||||
}
|
||||
if (!e -> isAccepted()) {
|
||||
if (transmit_event) {
|
||||
QGraphicsScene::keyPressEvent(e);
|
||||
}
|
||||
}
|
||||
@@ -174,6 +176,7 @@ void Diagram::keyPressEvent(QKeyEvent *e) {
|
||||
@param e QKeyEvent decrivant l'evenement clavier
|
||||
*/
|
||||
void Diagram::keyReleaseEvent(QKeyEvent *e) {
|
||||
bool transmit_event = true;
|
||||
if (!isReadOnly()) {
|
||||
// detecte le relachement d'une touche de direction ( = deplacement d'elements)
|
||||
if (
|
||||
@@ -182,10 +185,11 @@ void Diagram::keyReleaseEvent(QKeyEvent *e) {
|
||||
!e -> isAutoRepeat()
|
||||
) {
|
||||
endMoveElements();
|
||||
e->accept();
|
||||
e -> accept();
|
||||
transmit_event = false;
|
||||
}
|
||||
}
|
||||
if (!e -> isAccepted()) {
|
||||
if (transmit_event) {
|
||||
QGraphicsScene::keyReleaseEvent(e);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user