X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_PageBase.cpp;h=daf1bd034e5dbf61f8b64047e6d61f51659e161b;hb=423f6b0a08a86d5e47115b87603cddeae4468b49;hp=dac665edd3fbb0fd089e2c90e43ca7c14156d3b2;hpb=806d6cb3a4f7980426bc63d7c6f1d9c87be260a4;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_PageBase.cpp b/src/ModuleBase/ModuleBase_PageBase.cpp
index dac665edd..daf1bd034 100644
--- a/src/ModuleBase/ModuleBase_PageBase.cpp
+++ b/src/ModuleBase/ModuleBase_PageBase.cpp
@@ -1,3 +1,4 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 /*
  * ModuleBase_PageBase.cpp
  *
@@ -38,29 +39,49 @@ void ModuleBase_PageBase::addPageWidget(ModuleBase_PageBase* thePage)
   placePageWidget(thePage);
 }
 
+void ModuleBase_PageBase::addWidget(QWidget* theWidget)
+{
+  placeWidget(theWidget);
+}
+
 void ModuleBase_PageBase::clearPage()
 {
+  myWidgetList.clear();
+
   QLayoutItem *aChild;
   while ((aChild = pageLayout()->takeAt(0)) != 0) {
     if(aChild->widget()) {
-      aChild->widget()->deleteLater();
+      delete aChild->widget();
     } else {
       delete aChild;
     }
   }
-  myWidgetList.clear();
+
+  // Issue #460: this patch is necessary since the row stretch information
+  // is stored independently on the items: when the items are removed
+  // from the layout the stretch information is kept, so in the next
+  // filling of the layout some "additional" (old) rows may be stretched
+  // without necessity.
+  // In this patch we clear the stretch information specifying the default value: 0.
+  QGridLayout* aLayout = dynamic_cast<QGridLayout*>( pageLayout() );
+  if( aLayout )
+  {
+    int r = aLayout->rowCount();
+    for( int i=0; i<r; i++ )
+      aLayout->setRowStretch( i, 0 );
+  }
 }
 
 
-void ModuleBase_PageBase::takeFocus()
+bool ModuleBase_PageBase::takeFocus()
 {
   if(myWidgetList.isEmpty())
-    return;
+    return false;
 
-  myWidgetList.first()->focusTo();
+  return myWidgetList.first()->focusTo();
 }
 
-QList<ModuleBase_ModelWidget*> ModuleBase_PageBase::modelWidgets()
+QList<ModuleBase_ModelWidget*> ModuleBase_PageBase::modelWidgets() const
 {
   return myWidgetList;
 }
@@ -84,3 +105,9 @@ void ModuleBase_PageBase::alignToTop()
     addPageStretch();
   }
 }
+
+void ModuleBase_PageBase::placePageWidget(ModuleBase_PageBase* theWidget)
+{
+  QWidget* aWidget = dynamic_cast<QWidget*>(theWidget);
+  placeWidget(aWidget);
+}