Bug fix for IPAL18740

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 6b7947f2c7805a634e7cdd42cb01ca7ae0473b66..1554d6c8f20e53001e76fb1821225d64d7252b7a 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -706,12 +706,6 @@ void LightApp_Application::onNewDoc()
   saveDockWindowsState();
 
   CAM_Application::onNewDoc();
-
-  if ( !study ) // new study will be create in THIS application
-  {
-    updateWindows();
-    updateViewManagers();
-  }
 }
 
 /*!
@@ -1469,6 +1463,22 @@ void LightApp_Application::onDesktopActivated()
     aModule->studyActivated();
 }
 
+void LightApp_Application::studyOpened( SUIT_Study* s )
+{
+  CAM_Application::studyOpened( s );
+
+  updateWindows();
+  updateViewManagers();
+}
+
+void LightApp_Application::studyCreated( SUIT_Study* s )
+{
+  CAM_Application::studyCreated( s );
+
+  updateWindows();
+  updateViewManagers();
+}
+
 /*!Gets file filter.
  *\retval QString "(*.bin)"
  */

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 1b9e1cf2d8be1faf0b07756517edb1bb38dc750e..6a6081060664db54516f4c6e675c00db47a4324b 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -236,6 +236,9 @@ protected:
   void                                loadDockWindowsState();
   void                                saveDockWindowsState();
 
+  virtual void                        studyOpened( SUIT_Study* );
+  virtual void                        studyCreated( SUIT_Study* );
+
   void                                updatePreference( const QString&, const QString&, const QString& );
 
   QString                             defaultModule() const;

diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx
index 7ca329ac2e8ef97af7f0206c0384f554cafb79b9..8e77da2e13ba5443e2326bbf055e3c7420d46422 100644 (file)
--- a/src/Qtx/QtxMainWindow.cxx
+++ b/src/Qtx/QtxMainWindow.cxx
@@ -238,7 +238,7 @@ QString QtxMainWindow::storeGeometry() const
   else
     y = QString( "+%1" ).arg( frame.top() );
 
-  QString geom = QString( "%1x%2%3%4" ).arg( frame.width() ).arg( frame.height() ).arg( x ).arg( y );
+  QString geom = QString( "%1x%2%3%4" ).arg( width() ).arg( height() ).arg( x ).arg( y );
 
   QString state;
   switch ( windowState() )
@@ -339,7 +339,9 @@ void QtxMainWindow::retrieveGeometry( const QString& str )
       state = Qt::WindowFullScreen;
   }
 
-  setGeometry( rect );
+  resize( rect.size() );
+  move( rect.topLeft() );
+
   if ( state != Qt::WindowNoState )
     setWindowState( state );
 }