fix persistence in other widgets

1 files changed, 14 insertions, 10 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 90cd5f1..ae1632e 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -176,25 +176,29 @@ public:
 	static void show_mx(QWidget* mw, bool nomaximize, QString &strName/* = QString::null */)
 	{
-	if ( mw->isVisible() ) {
-	    mw->raise();
-	} else {
 	    QPoint p;
 	    QSize s;
+		bool max;
+	if ( mw->isVisible() ) {
+		if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
+		    mw->resize(s);
+		    mw->move(p);
+		}
+		mw->raise();
+	} else {
 
 	    if ( mw->layout() && mw->inherits("QDialog") ) {
-		bool max;
 		if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
 		    mw->resize(s);
 		    mw->move(p);
 
-		    if ( max && !nomaximize )
+		    if ( max && !nomaximize ) {
 			mw->showMaximized();
-		    else
+		    } else {
 			mw->show();
+				}
 		} else {
-		    qpe_show_dialog((QDialog*)mw,nomaximize);
+			qpe_show_dialog((QDialog*)mw,nomaximize);
 		}
 	    } else {
-		bool max;
 		if ( read_widget_rect(strName, max, p, s) && validate_widget_size(mw, p, s) ) {
 		    mw->resize(s);
@@ -303,5 +307,5 @@ static void qpe_show_dialog( QDialog* d, bool nomax )
     {
 	maximized = TRUE;
-
+	qDebug("read_widget_rect");
 	// 350 is the trigger in qwsdefaultdecoration for providing a resize button
 	if ( qApp->desktop()->width() <= 350 )
@@ -375,5 +379,5 @@ static void qpe_show_dialog( QDialog* d, bool nomax )
 	if ( qApp->desktop()->width() <= 350 )
 	    return;
-
+	qDebug("store_widget_rect");
 	// we use these to map the offset of geometry and pos.  ( we can only use normalGeometry to
 	// get the non-maximized version, so we have to do it the hard way )