#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 fc50a6d73d8ac62909a9e403750ad8d9cf86cedf..fa2ba0da84c4ae4de183f2171543c786ccfdb0cc 100755 (executable)
--- 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;
       }