Changeset 912 for trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc

Timestamp:

Jan 22, 2009, 4:40:11 PM (15 years ago)

Author:

garnier

Message:

History change, and a Warning added

File:

• trunk/source/visualization/OpenGL/src/G4OpenGLXViewer.cc (modified) (3 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLXViewer.cc,v 1.45 2009/01/19 16:53:42 lgarnier Exp $
+// $Id: G4OpenGLXViewer.cc,v 1.47 2009/01/22 15:39:55 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -219 +219 @@
   fWinSize_y = fVP.GetWindowSizeHintY();
   G4int x_origin = fVP.GetWindowAbsoluteLocationHintX(DisplayWidth(dpy, vi -> screen));
+
+  // FIXME,  screen size != window size on MAC, but I don't know have to get the menuBar
+  // size on MAC. L.Garnier 01/2009
   G4int y_origin = fVP.GetWindowAbsoluteLocationHintY(DisplayHeight(dpy, vi -> screen));
 
@@ -225 +228 @@
   size_hints->x = x_origin;
   size_hints->y = y_origin;
-  size_hints->flags |= PSize | PPosition;
-
+  if (fVP.IsWindowSizeHintX () && fVP.IsWindowLocationHintX () && fVP.IsWindowLocationHintY ()) {
+    size_hints->flags |= PSize | PPosition;
+  } else if (fVP.IsWindowSizeHintX () && !(fVP.IsWindowLocationHintX () || fVP.IsWindowLocationHintY ())) {
+    size_hints->flags |= PSize;
+  } else if ((!fVP.IsWindowSizeHintX ()) && fVP.IsWindowLocationHintX () && fVP.IsWindowLocationHintY ()) {
+    size_hints->flags |= PPosition;
+  }
   G4cout << "Window name: " << fName << G4endl;
   strncpy (charViewName, fName, 100);