Improve calculation of size of preferences panel.

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

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index c5d0c93b81ed19e0716dbd09f1aca7f4aa7c34c3..0099869f50e86fd6cc92f88e407822eabf49d33e 100644 (file)
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -76,18 +76,12 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th
   setObjectName(PROP_PANEL);
   setStyleSheet("::title { position: relative; padding-left: 5px; text-align: left center }");
 
-  QScrollArea* aScroll = new QScrollArea(this);
-  aScroll->setWidgetResizable(true);
-  aScroll->setFrameStyle(QFrame::NoFrame);
-
-  QWidget* aContent = new QWidget(aScroll);
+  QWidget* aContent = new QWidget(this);
   QGridLayout* aMainLayout = new QGridLayout(aContent);
   const int kPanelColumn = 0;
   int aPanelRow = 0;
   aMainLayout->setContentsMargins(3, 3, 3, 3);
-  aScroll->setWidget(aContent);
-
-  setWidget(aScroll);
+  setWidget(aContent);
 
   QFrame* aFrm = new QFrame(aContent);
   aFrm->setFrameStyle(QFrame::Raised);
@@ -100,9 +94,9 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th
 
   QStringList aBtnNames;
   aBtnNames << QString(PROP_PANEL_HELP)
-            << QString(PROP_PANEL_OK)
-            << QString(PROP_PANEL_OK_PLUS)
-            << QString(PROP_PANEL_CANCEL);
+    << QString(PROP_PANEL_OK)
+    << QString(PROP_PANEL_OK_PLUS)
+    << QString(PROP_PANEL_CANCEL);
   foreach(QString eachBtnName, aBtnNames) {
     QToolButton* aBtn = new QToolButton(aFrm);
     aBtn->setObjectName(eachBtnName);
@@ -226,16 +220,24 @@ void XGUI_PropertyPanel::createContentPanel(FeaturePtr theFeature)
   if (theFeature->isAction() || !theFeature->data())
     return;
 
+  ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
   if (myWidgets.empty()) {
-    ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
     QString aXmlRepr = anOperation->getDescription()->xmlRepresentation();
 
     ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myOperationMgr->workshop());
-    aFactory.createPanel(contentWidget(), theFeature);
-    /// Apply button should be update if the feature was modified by the panel
+    ModuleBase_PageBase* aPage = contentWidget();
+    aFactory.createPanel(aPage, theFeature);
+    // update model widgets if exist
+    setModelWidgets(aPage->modelWidgets());
+    // Apply button should be update if the feature was modified by the panel
     myOperationMgr->onValidateOperation();
   }
-  updateApplyPlusButton(theFeature);
+  ModuleBase_OperationFeature* aFeatureOp =
+    dynamic_cast<ModuleBase_OperationFeature*>(anOperation);
+  if (aFeatureOp && (!aFeatureOp->isEditOperation()))
+    updateApplyPlusButton(theFeature);
+  else
+    findButton(PROP_PANEL_OK_PLUS)->setVisible(false);
 }
 
 void XGUI_PropertyPanel::updateApplyPlusButton(FeaturePtr theFeature)
@@ -479,7 +481,7 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
     ModuleBase_ModelWidget* aNewFocusMWidget = ModuleBase_ModelWidget::findModelWidget(this,
                                                                               aNewFocusWidget);
     if (aNewFocusMWidget) {
-      if (aFocusMWidget) {
+      if (aFocusMWidget && (aFocusMWidget != aNewFocusMWidget)) {
         aFocusMWidget->setHighlighted(false);
       }
       aNewFocusMWidget->emitFocusInWidget();