Explorar o código

Merge branch '3850-slicer-fix-qMRMLSliceControllerWidgetEventTranslatorPlayerTest1'

* 3850-slicer-fix-qMRMLSliceControllerWidgetEventTranslatorPlayerTest1:
  Fix qMRMLSliceControllerWidgetEventTranslatorPlayerTest1 on MacOSX
Jean-Christophe Fillion-Robin %!s(int64=10) %!d(string=hai) anos
pai
achega
16aa09540d
Modificáronse 1 ficheiros con 2 adicións e 0 borrados
  1. 2 0
      Libs/Widgets/ctkBasePopupWidget.cpp

+ 2 - 0
Libs/Widgets/ctkBasePopupWidget.cpp

@@ -437,10 +437,12 @@ void ctkBasePopupWidgetPrivate::hideAll()
   // Before hiding, transfer the active window flag to its parent, this will
   // prevent the application to send a ApplicationDeactivate signal that
   // doesn't need to be done.
+#ifndef Q_OS_MAC // See Slicer issue #3850
   if (q->isActiveWindow() && !this->BaseWidget.isNull())
     {
     qApp->setActiveWindow(this->BaseWidget->window());
     }
+#endif
 
   q->hide();
   this->PopupPixmapWidget->hide();