[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 411662 by staikos:

some of the geometry fixes required for bug 105220
CCBUG: 105220


 M  +2 -3      trunk/extragear/graphics/kst/kst/kstfilterdialog_i.cpp  
 M  +3 -5      trunk/extragear/graphics/kst/kst/kstfitdialog_i.cpp  
 M  +2 -3      trunk/extragear/graphics/kst/kst/kstplugindialog_i.cpp  


--- trunk/extragear/graphics/kst/kst/kstfilterdialog_i.cpp #411661:411662
@@ -174,8 +174,8 @@
 
 
 void KstFilterDialogI::fixupLayout() {
-  _frameWidget->resize(_frameWidget->sizeHint());
-  _pluginFrame->resize(_pluginFrame->sizeHint());
+  _frameWidget->updateGeometry();
+  _pluginFrame->updateGeometry();
   resize(sizeHint());
   setMinimumSize(size());
   updateGeometry();
@@ -541,7 +541,6 @@
   // Create a new one
   QGridLayout *topGrid = dynamic_cast<QGridLayout*>(_pluginFrame->layout());
   if (topGrid) {
-    topGrid->invalidate();
     topGrid->addWidget(_frameWidget = new QWidget(_pluginFrame, "Frame Widget"), 0, 0);
   } else {
     kdError() << "Somehow we lost the grid!" << endl;
--- trunk/extragear/graphics/kst/kst/kstfitdialog_i.cpp #411661:411662
@@ -86,8 +86,7 @@
 void KstFitDialogI::show_setCurve(const QString& strCurve,
                                   const QString& strPlotName,
                                   const QString& strWindow) {
-
-  KstBaseCurvePtr  curve;
+  KstBaseCurvePtr curve;
   KstBaseCurveList curves = kstObjectSubList<KstDataObject, KstBaseCurve>(KST::dataObjectList);
   KstPluginList c = kstObjectSubList<KstDataObject, KstPlugin>(KST::dataObjectList);
   QString new_label;
@@ -183,8 +182,8 @@
 
 
 void KstFitDialogI::fixupLayout() {
-  _frameWidget->resize(_frameWidget->sizeHint());
-  _pluginFrame->resize(_pluginFrame->sizeHint());
+  _frameWidget->updateGeometry();
+  _pluginFrame->updateGeometry();
   resize(sizeHint());
   setMinimumSize(size());
   updateGeometry();
@@ -625,7 +624,6 @@
   // Create a new one
   QGridLayout *topGrid = dynamic_cast<QGridLayout*>(_pluginFrame->layout());
   if (topGrid) {
-    topGrid->invalidate();
     topGrid->addWidget(_frameWidget = new QWidget(_pluginFrame, "Frame Widget"), 0, 0);
   } else {
     kdError() << "Somehow we lost the grid!" << endl;
--- trunk/extragear/graphics/kst/kst/kstplugindialog_i.cpp #411661:411662
@@ -299,8 +299,8 @@
 
 
 void KstPluginDialogI::fixupLayout() {
-  _frameWidget->resize(_frameWidget->sizeHint());
-  _pluginFrame->resize(_pluginFrame->sizeHint());
+  _frameWidget->updateGeometry();
+  _pluginFrame->updateGeometry();
   resize(sizeHint());
   setMinimumSize(size());
   updateGeometry();
@@ -804,7 +804,6 @@
   // Create a new one
   QGridLayout *topGrid = dynamic_cast<QGridLayout*>(_pluginFrame->layout());
   if (topGrid) {
-    topGrid->invalidate();
     topGrid->addWidget(_frameWidget = new QWidget(_pluginFrame, "Frame Widget"), 0, 0);
   } else {
     kdError() << "Somehow we lost the grid!" << endl;