GLViewPort2d fit all operation is called after the correct GLWidget resizing.

diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h
index 76b59b6d4d08a74b7e43c6d1f4c25a7a5a6e696d..400f9b27a72773537023235d024221808d95def3 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.h
+++ b/src/GLViewer/GLViewer_ViewPort2d.h
@@ -58,6 +58,7 @@ class QtxToolTip;
 class GLViewer_ViewPort2d: public GLViewer_ViewPort
 {
   Q_OBJECT
+  friend class GLViewer_Widget;
 
   //! Dragging states
   enum vpDragState{ noDrag, initDrag, inDrag };

diff --git a/src/GLViewer/GLViewer_Widget.cxx b/src/GLViewer/GLViewer_Widget.cxx
index 1fc069d204406a7481a7b1eaa4953716c3bf86dc..8a2df1827386996fb4c5c251766b986d43e16fb7 100644 (file)
--- a/src/GLViewer/GLViewer_Widget.cxx
+++ b/src/GLViewer/GLViewer_Widget.cxx
@@ -340,15 +340,16 @@ void GLViewer_Widget::resizeGL( int w, int h )
   if( w < 1 ) w = 1;
   glViewport( 0, 0, w, h);
 
-  if( myStart )
+  myViewPort->initResize( w, h );
+
+  if( myStart && w > 1 && h > 1 )
   {
     myWidth = w;
     myHeight = h;
+    myViewPort->fitAll();
     myStart = GL_FALSE;
   }
 
-  myViewPort->initResize( w, h );
-
   glMatrixMode( GL_PROJECTION );
   glLoadIdentity();
   GLfloat w_c = w / 2., h_c = h / 2.;