ISSUE-5503: Focus set proper when changing the shape that we are acti…

…vly drawing
OpenModelica · May 27, 2019 · 04b5e7a · 04b5e7a
1 parent a7237c2
commit 04b5e7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/OMEdit/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEdit/OMEditGUI/MainWindow.cpp
@@ -2676,6 +2676,7 @@ void MainWindow::openAboutOMEdit()
 
 void MainWindow::toggleShapesButton()
 {
+  setFocus();
   QAction *clickedAction = qobject_cast<QAction*>(const_cast<QObject*>(sender()));
   QList<QAction*> shapeActions = mpShapesActionGroup->actions();
   foreach (QAction *shapeAction, shapeActions) {

diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -2914,6 +2914,10 @@ void GraphicsView::focusOutEvent(QFocusEvent *event)
   if (QApplication::overrideCursor() && QApplication::overrideCursor()->shape() == Qt::CrossCursor) {
     QApplication::restoreOverrideCursor();
   }
+  /*If we get a focus out event while drawing. Stop drawing.*/
+  if (isCreatingShape()) {
+    finishDrawingGenericShape();
+  }
   QGraphicsView::focusOutEvent(event);
 }