Merge branch 'Dev_2.1.0' of salome:modules/shaper into Dev_2.1.0

[modules/shaper.git] / src / PartSet / PartSet_WidgetSketchLabel.cpp

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index b167f5a47d31f3afc287d0df3afee39e6442c80b..a9496370befd642c1546bc5f83205f52c47536e5 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -235,7 +235,7 @@ std::shared_ptr<GeomAPI_Pln> PartSet_WidgetSketchLabel::plane() const
 
 bool PartSet_WidgetSketchLabel::focusTo()
 {
-  myStackWidget->setFocus();
+  ModuleBase_Tools::setFocus(myStackWidget, "PartSet_WidgetSketchLabel::focusTo()");
   return true;
 }
 
@@ -338,10 +338,13 @@ void PartSet_WidgetSketchLabel::activateCustom()
 void PartSet_WidgetSketchLabel::deactivate()
 {
   ModuleBase_ModelWidget::deactivate();
+  bool aHidePreview = myPreviewDisplayed;
   erasePreviewPlanes();
   activateSelection(false);
 
   activateFilters(false);
+  if (aHidePreview)
+    myWorkshop->viewer()->update();
 }
 
 void PartSet_WidgetSketchLabel::activateSelection(bool toActivate)