From: nds <nds@opencascade.com>
Date: Thu, 3 Nov 2016 10:57:20 +0000 (+0300)
Subject: #1821 Axis by two plains: problem in selection update
X-Git-Tag: V_2.6.0~119
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f1d8496b109dbb89fa0147e336599e9be9c1e8e2;p=modules%2Fshaper.git

#1821 Axis by two plains: problem in selection update

check canAcceptFocus before focus set.
---

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index fc50a6d73..fa2ba0da8 100755
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -250,6 +250,9 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget,
       if (!aCurrentWidget->isObligatory())
         continue; // not obligatory widgets are not activated automatically
 
+      if (!aCurrentWidget->canAcceptFocus())
+        continue; // do not set focus if it can not be accepted, case: optional choice
+
       if (aCurrentWidget->focusTo()) {
         return;
       }