From a0bde34b58d67f404bc2c0da1ec457bc0ca652cb Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 22 Mar 2016 14:47:04 +0300 Subject: [PATCH] Issue #1343 Improvement of Extrusion and Revolution operations: multi-selector control accepts focus after initial extrusion selection. --- src/PartSet/PartSet_WidgetMultiSelectorComposite.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/PartSet/PartSet_WidgetMultiSelectorComposite.cpp b/src/PartSet/PartSet_WidgetMultiSelectorComposite.cpp index fb1238c3a..2c34e5c2a 100755 --- a/src/PartSet/PartSet_WidgetMultiSelectorComposite.cpp +++ b/src/PartSet/PartSet_WidgetMultiSelectorComposite.cpp @@ -19,13 +19,16 @@ PartSet_WidgetMultiSelectorComposite::~PartSet_WidgetMultiSelectorComposite() bool PartSet_WidgetMultiSelectorComposite::focusTo() { - bool aHasSubObjects = hasSubObjects(); + bool aCanHaveFocus = true; + if (hasSubObjects()) { // disable widget controls - if (aHasSubObjects) disableControls(); - - return !aHasSubObjects; + aCanHaveFocus = false; + } + else + aCanHaveFocus = ModuleBase_WidgetMultiSelector::focusTo(); + return aCanHaveFocus; } void PartSet_WidgetMultiSelectorComposite::setEditingMode(bool isEditing) -- 2.39.2