X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FModuleBase%2FModuleBase_PageBase.cpp;h=ed9fb7694031d374eb4120e8ee216a60a9afe5bd;hb=902ee072b1eb3122ee3a3b8ce8c9722b5a671e0b;hp=dac665edd3fbb0fd089e2c90e43ca7c14156d3b2;hpb=91f0016d88c394285291acb310227af2e06c2256;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_PageBase.cpp b/src/ModuleBase/ModuleBase_PageBase.cpp
index dac665edd..ed9fb7694 100644
--- a/src/ModuleBase/ModuleBase_PageBase.cpp
+++ b/src/ModuleBase/ModuleBase_PageBase.cpp
@@ -40,24 +40,39 @@ void ModuleBase_PageBase::addPageWidget(ModuleBase_PageBase* thePage)
 
 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()