summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-03-24 09:58:47 +0000
committerakashihi <akashihi@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-03-24 09:58:47 +0000
commit1c3dfe8523eb59afa7dea866c0064f15bb0bafe0 (patch)
treecb5c113a81686c7a6a389632bb6124cbd38118f0
parent01ec898204134748dab4736d8c8a43bc9d73a855 (diff)
downloadnavit-svn-1c3dfe8523eb59afa7dea866c0064f15bb0bafe0.tar.gz
Fix:gui/qml:Added proper focus switching between graphics/gui
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit/navit@3080 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r--gui/qml/gui_qml.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/gui/qml/gui_qml.cpp b/gui/qml/gui_qml.cpp
index 0b198a53..1e1c7be3 100644
--- a/gui/qml/gui_qml.cpp
+++ b/gui/qml/gui_qml.cpp
@@ -303,6 +303,7 @@ public slots:
}
void backToMap() {
if (this->object->graphicsWidget) {
+ this_->graphicsWidget->setFocus(Qt::ActiveWindowFocusReason);
this->object->switcherWidget->setCurrentWidget(this->object->graphicsWidget);
}
}
@@ -544,6 +545,7 @@ static void gui_qml_button(void *data, int pressed, int button, struct point *p)
to re-design the popup feature or remove it at all */
if ( button == 3 ) {
this_->guiProxy->setNewPoint(p,MapPoint);
+ this_->guiWidget->setFocus(Qt::ActiveWindowFocusReason);
this_->guiWidget->reset();
this_->guiProxy->setReturnSource(QString(""));
this_->guiProxy->setPage("point.qml");
@@ -567,6 +569,7 @@ static void gui_qml_button(void *data, int pressed, int button, struct point *p)
this_->guiProxy->setReturnSource(QString(""));
this_->guiProxy->setPage("main.qml");
}
+ this_->guiWidget->setFocus(Qt::ActiveWindowFocusReason);
this_->switcherWidget->setCurrentWidget(this_->guiWidget);
}
}