Changeset 1181 for trunk

Timestamp:

Nov 17, 2009, 7:32:39 PM (15 years ago)

Author:

garnier

Message:

fix for tab

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc (modified) (4 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLQtViewer.cc

@@ -119 +119 @@
   G4Qt* interactorManager = G4Qt::getInstance ();
 
+  ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
+    
   // FIXME L.Garnier 9/11/09 Has to be check !!! 
   // Qt UI with Qt Vis
@@ -127 +129 @@
 
   // return false if G4UIQt was not launch
-  bool res = interactorManager->AddTabVisWidget(fWindow,name);
+  bool res = interactorManager->AddTabVisWidget(fWindow,name,getWinWidth(),getWinHeight());
 
   if (!res) { // we have to do a dialog
@@ -169 +171 @@
     fGLWindow->setLayout(mainLayout);
 #endif
+
+    
+    //useful for MACOSX, we have to compt the menuBar height
+    int offset = QApplication::desktop()->height() 
+      - QApplication::desktop()->availableGeometry().height();
+    
+    G4int YPos= fVP.GetWindowAbsoluteLocationHintY(QApplication::desktop()->height());
+    if (fVP.GetWindowAbsoluteLocationHintY(QApplication::desktop()->height())< offset) {
+      YPos = offset;
+    }
+    fGLWindow->resize(getWinWidth(), getWinHeight());
+#ifdef G4DEBUG_VIS_OGL
+    printf("G4OpenGLQtViewer::CreateMainWindow :: resizing to %d %d \n",getWinWidth(), getWinHeight());
+#endif
+    fGLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
+    fGLWindow->show();
   } else {
     fGLWindow = fWindow;
@@ -174 +192 @@
   
   
-  ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
-  
-  //useful for MACOSX, we have to compt the menuBar height
-  int offset = QApplication::desktop()->height() 
-    - QApplication::desktop()->availableGeometry().height();
-  
-  G4int YPos= fVP.GetWindowAbsoluteLocationHintY(QApplication::desktop()->height());
-  if (fVP.GetWindowAbsoluteLocationHintY(QApplication::desktop()->height())< offset) {
-    YPos = offset;
-  }
-  fGLWindow->resize(getWinWidth(), getWinHeight());
-  fGLWindow->move(fVP.GetWindowAbsoluteLocationHintX(QApplication::desktop()->width()),YPos);
-  fGLWindow->show();
   
   if(!fWindow) return;