bugfix 2638,2639

This commit is contained in:
2008-06-09 15:44:04 +00:00
parent 09bb086f84
commit af10b7149c
+7 -5
View File
@@ -3693,17 +3693,18 @@ void ProjectPanel::loadSplitters(QString filename)
out1+= " " + val; out1+= " " + val;
qDebug(out1.toAscii().data()); qDebug(out1.toAscii().data());
if (!val.isEmpty())
{
int w1 = val.section(',',0,0).toInt(); int w1 = val.section(',',0,0).toInt();
int w2 = val.section(',',1,1).toInt(); int w2 = val.section(',',1,1).toInt();
if (w1==0&&w2==0)
{
w1=250;
w2=mdiWindow->width ()-250;
}
QList<int> sl; QList<int> sl;
sl.push_back(w1); sl.push_back(w1);
sl.push_back(w2); sl.push_back(w2);
if (w1 || w2) if (w1 || w2)
m_panel->mainSplitter->setSizes( sl ); m_panel->mainSplitter->setSizes( sl );
}
val = st->getStr("Layout/ObjInfoSplitter"+FileName); val = st->getStr("Layout/ObjInfoSplitter"+FileName);
if (!val.isEmpty()) if (!val.isEmpty())
@@ -3839,6 +3840,7 @@ void ProjectPanel::loadState (QString filename)
if (st->getInt("Window/maximized")!=0) if (st->getInt("Window/maximized")!=0)
{ {
mdiWindow->setGeometry (10,10,600,600); mdiWindow->setGeometry (10,10,600,600);
loadSplitters();
firstResize=true ; firstResize=true ;
} }
} }
@@ -3869,7 +3871,7 @@ void ProjectPanel::resizeEvent ( QResizeEvent* )
saveState(); saveState();
} }
if (!firstResize&&rcs!=NULL) if (!firstResize/*&&rcs!=NULL*/)
{ {
loadState(); loadState();
loadSplitters(); loadSplitters();