Changeset 8001331 in sasview

Timestamp:

Apr 9, 2014 8:34:02 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

12a1631

Parents:

6a4511d1

Message:

Fix panel position on windows

Location:

src/sans/guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• gui_statusbar.py (modified) (1 diff)

src/sans/guiframe/gui_manager.py

@@ -1017 +1017 @@
         win.SetSize((d_panel_width, h))
         is_visible = self.__gui_style & GUIFRAME.MANAGER_ON == GUIFRAME.MANAGER_ON
-        if not IS_WIN:
+        if IS_WIN:
+            win.SetPosition((0, 0))
+        else:
             win.SetPosition((0, mac_pos_y + size_t_bar))
         win.Show(is_visible)
@@ -1040 +1042 @@
                 frame.SetSize((w, h))
                 frame.Show(False)
-            if not IS_WIN:
+            if IS_WIN:
+                frame.SetPosition((d_panel_width + 1, 0))
+            else:
                 frame.SetPosition((d_panel_width + 1, mac_pos_y + size_t_bar))
 

src/sans/guiframe/gui_statusbar.py

@@ -133 +133 @@
         # Create status bar icon reflecting the type of status
         # for the last message
-        self.status_color = wx.StaticText(self, id=wx.NewId(), label="   ")
+        self.status_color = wx.StaticText(self, id=wx.NewId(), label="   ", size=wx.Size(15,15))
         self.status_color.SetBackgroundColour(GREEN)
         self.status_color.SetForegroundColour(GREEN)