suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix stack overflow error

Browse Source
This commit is contained in:
wmayer 2014-10-10 15:47:20 +02:00
parent daedcf4f1c
commit 4a3838fa44
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Gui/View3DInventor.cpp
View File

@ -931,7 +931,6 @@ void View3DInventor::setCurrentViewMode(ViewMode newmode)
// //
// It is important to set the focus proxy to get all key events otherwise we would loose // It is important to set the focus proxy to get all key events otherwise we would loose
// control after redirecting the first key event to the GL widget. // control after redirecting the first key event to the GL widget.
// We redirect these events in keyPressEvent() and keyReleaseEvent().
if (oldmode == Child) { if (oldmode == Child) {
// To make a global shortcut working from this window we need to add // To make a global shortcut working from this window we need to add
// all existing actions from the mainwindow and its sub-widgets // all existing actions from the mainwindow and its sub-widgets
@ -980,31 +979,15 @@ void View3DInventor::keyPressEvent (QKeyEvent* e)
if (e->key() == Qt::Key_Escape) { if (e->key() == Qt::Key_Escape) {
setCurrentViewMode(Child); setCurrentViewMode(Child);
} }
else {
// Note: The key events should be redirected directly to the GL widget and not to the main window
// otherwise the first redirected key event always disappears in hyperspace.
//
// send the event to the GL widget that converts to and handles an SoEvent
QWidget* w = _viewer->getGLWidget();
QApplication::sendEvent(w,e);
} }
}
else {
QMainWindow::keyPressEvent(e); QMainWindow::keyPressEvent(e);
} }
}
void View3DInventor::keyReleaseEvent (QKeyEvent* e) void View3DInventor::keyReleaseEvent (QKeyEvent* e)
{ {
ViewMode mode = MDIView::currentViewMode();
if (mode != Child) {
// send the event to the GL widget that converts to and handles an SoEvent
QWidget* w = _viewer->getGLWidget();
QApplication::sendEvent(w,e);
} else {
QMainWindow::keyReleaseEvent(e); QMainWindow::keyReleaseEvent(e);
} }
}
void View3DInventor::focusInEvent (QFocusEvent * e) void View3DInventor::focusInEvent (QFocusEvent * e)
{ {