Merge 63da22b into 6999d18

opencor · Nov 28, 2019 · c048208 · c048208
2 parents 6999d18 + 63da22b
commit c048208
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp b/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp
@@ -650,8 +650,18 @@ void SimulationExperimentViewSimulationWidget::changeEvent(QEvent *pEvent)
     // Check whether we are becoming enabled/disabled, in which case we want to
     // update our output widget while keeping its scrollbars, if any, still at
     // the same position
+    // Note: we used to do this only when we were visible, but in some cases
+    //       (e.g. when running a simulation from our Python console) this may
+    //       result in our output widget not being re-enabled. So, now, we
+    //       want to update our output widget even when it's not visible.
+    //       However, to be able to do so, we must have been visible at least
+    //       once, hence our use of mCanHandleChangeEvent...
 
-    if (pEvent->type() == QEvent::EnabledChange) {
+    if (isVisible()) {
+        mCanHandleChangeEvent = true;
+    }
+
+    if (mCanHandleChangeEvent && (pEvent->type() == QEvent::EnabledChange)) {
         int horizontalSliderPosition = mOutputWidget->horizontalScrollBar()->sliderPosition();
         int verticalSliderPosition = mOutputWidget->verticalScrollBar()->sliderPosition();
 

diff --git a/...lugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.h b/...lugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.h
@@ -239,6 +239,8 @@ class SimulationExperimentViewSimulationWidget : public Core::Widget
 
     Core::UserMessageWidget *mInvalidModelMessageWidget;
 
+    bool mCanHandleChangeEvent = false;
+
     QTextEdit *mOutputWidget;
     QString mOutputMessage;