Issue #2288: Update column with icons in object browser on Linux

[modules/shaper.git] / src / XGUI / XGUI_PropertyPanel.cpp

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index be453d93c502db76f62425deb4b2e12d159884d9..bdc4792593ea8b0c9439af775711c4f4daa76d9b 100755 (executable)
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -1,11 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
-/*
- * XGUI_PropertyPanel.cpp
- *
- *  Created on: Apr 29, 2014
- *      Author: sbh
- */
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <XGUI_PropertyPanel.h>
 #include <XGUI_ActionsMgr.h>
@@ -262,6 +273,7 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget,
         continue; // do not set focus if it can not be accepted, case: optional choice
 
       if (aCurrentWidget->focusTo()) {
+        aCurrentWidget->emitFocusInWidget();
         return;
       }
     }
@@ -280,7 +292,7 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget,
       aNewFocusWidget = aCancelBtn;
   }
   if (aNewFocusWidget)
-    aNewFocusWidget->setFocus(Qt::TabFocusReason);
+    ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::activateNextWidget");
 
   activateWidget(NULL);
 }
@@ -341,6 +353,11 @@ void findDirectChildren(QWidget* theParent, QList<QWidget*>& theWidgets, const b
 #endif
 }
 
+bool XGUI_PropertyPanel::setFocusNextPrevChild(bool theIsNext)
+{
+  return focusNextPrevChild(theIsNext);
+}
+
 bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
 {
   // it wraps the Tabs clicking to follow in the chain:
@@ -354,6 +371,10 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
     qDebug(anInfo.toStdString().c_str());
   }
 #endif
+  ModuleBase_ModelWidget* aFocusMWidget = ModuleBase_ModelWidget::findModelWidget(this,
+                                                                         aFocusWidget);
+  if (aFocusMWidget)
+    aFocusMWidget->setHighlighted(false);
 
   QWidget* aNewFocusWidget = 0;
   if (aFocusWidget) {
@@ -398,7 +419,6 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
   }
   if (aNewFocusWidget) {
     if (myActiveWidget) {
-      myActiveWidget->getControls();
       bool isFirstControl = !theIsNext;
       QWidget* aLastFocusControl = myActiveWidget->getControlAcceptingFocus(isFirstControl);
       if (aFocusWidget == aLastFocusControl) {
@@ -406,8 +426,13 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
       }
     }
 
-    //ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::focusNextPrevChild()");
-    aNewFocusWidget->setFocus(theIsNext ? Qt::TabFocusReason : Qt::BacktabFocusReason);
+    // we want to have property panel as an active window to enter values in double control
+    ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::focusNextPrevChild()");
+
+    ModuleBase_ModelWidget* aNewFocusMWidget = ModuleBase_ModelWidget::findModelWidget(this,
+                                                                              aNewFocusWidget);
+    if (aNewFocusMWidget)
+      aNewFocusMWidget->emitFocusInWidget();
     isChangedFocus = true;
   }
   return isChangedFocus;