Changeset 036e9ba in sasview

Timestamp:

Apr 25, 2012 6:18:06 AM (13 years ago)

Author:

Robert Whitley <robert.whitley@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7dfdd56

Parents:

278b995

Message:

Refs #54. If the window is too big then it will reduce to fit screen.

Make sure it is setup correctly on multiple screens.
Take into account the task bar for all OS's.

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -3324 +3324 @@
         """
         """
-        global GUIFRAME_WIDTH, GUIFRAME_HEIGHT  
-        
-        if (GUIFRAME_WIDTH > ((wx.DisplaySize()[0]/100)*90) | GUIFRAME_HEIGHT > ((wx.DisplaySize()[1]/100)*90) ):
-            GUIFRAME_WIDTH = (wx.DisplaySize()[0]/100)*90
-            GUIFRAME_HEIGHT = (wx.DisplaySize()[1]/100)*90
-
         pos, size = self.window_placement((GUIFRAME_WIDTH, GUIFRAME_HEIGHT))     
         self.frame = ViewerFrame(parent=None, 
@@ -3433 +3427 @@
         placed on the left side of the screen.
         """
-        window_width, window_height = size
-        screen_size = wx.GetDisplaySize()
-        window_height = window_height if screen_size[1]>window_height else screen_size[1]-10
-        window_width  = window_width if screen_size[0]> window_width else screen_size[0]-10
-        xpos = ypos = 0
-
+        
+        # Get size of screen without 
+        for screenCount in range(wx.Display().GetCount()):
+            screen = wx.Display(screenCount)
+            if screen.IsPrimary():
+                displayRect = screen.GetClientArea()
+                break
+        
+        posX, posY, displayWidth, displayHeight = displayRect        
+        customWidth, customHeight = size
+        
+        # If the custom screen is bigger than the window screen than make maximum size
+        if customWidth > displayWidth:
+            customWidth = displayWidth
+        if customHeight > displayHeight:
+            customHeight = displayHeight
+            
         # Note that when running Linux and using an Xming (X11) server on a PC
         # with a dual  monitor configuration, the reported display size may be
@@ -3445 +3450 @@
         # screen 'too big'.  If so, we assume a smaller width which means the
         # application will be placed towards the left hand side of the screen.
-
-        _, _, x, y = wx.Display().GetClientArea() # size excludes task bar
-        if len(sys.argv) > 1 and '--platform' in sys.argv[1:]:
-            w, h = wx.DisplaySize()  # size includes task bar area
-        # display on left side, not centered on screen
-        if x > 1920 and x > (2*y): x = x / 2  
-        if x > window_width:  xpos = (x - window_width)/2
-        if y > window_height: ypos = (y - window_height)/2
-
-        # Return the suggested position and size for the application frame.
-        return (xpos, ypos), (min(x, window_width), min(y, window_height))
+        
+        # If dual screen registered as 1 screen. Make width half.
+        if displayWidth > (displayHeight*2):
+            customWidth = displayWidth/2
+            posX = 0
+            posY = 0
+            
+        # Make the position the middle of the screen. (Not 0,0)
+        else:
+            posX = (displayWidth - customWidth)/2
+            posY = (displayHeight - customHeight)/2
+        
+        # Return the suggested position and size for the application frame.    
+        return (posX, posY), (min(displayWidth, customWidth), min(displayHeight, customHeight))
+
     
     def display_splash_screen(self, parent,