Changeset 9e96dbd in sasview for src/sas

Timestamp:

Jun 25, 2018 10:42:41 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

9b2b657, a8bbba2

Parents:

316b9c1 (diff), dabcaf7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (06/25/18 22:42:41)

git-committer:

GitHub <noreply@…> (06/25/18 22:42:41)

Message:

Merge pull request #156 from SasView?/ticket-1069

Ticket 1069: Fix for orphaned error boxes

Fixes #1069

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitpage.py (modified) (3 diffs)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2552 +2552 @@
             # draw
             self._draw_model()
+            self.Layout()
             self.Refresh()
         except Exception:

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -706 +706 @@
 
                         ix = 3
-                        ctl2 = wx.TextCtrl(self, wx.ID_ANY,
-                                           size=(_BOX_WIDTH / 1.3, 20),
-                                           style=0)
+                        ctl2 = BGTextCtrl(self, wx.ID_ANY,
+                                           size=(_BOX_WIDTH / 1.3, 20))
 
                         self.sizer4_4.Add(ctl2, (iy, ix), (1, 1),
@@ -1998 +1997 @@
         self.on_smear_helper()
         self.on_set_focus(None)
+        self.Layout()
         self.Refresh()
         # update model plot with new data information
@@ -2892 +2892 @@
                         text2.Hide()
                     ix += 1
-                    ctl2 = wx.TextCtrl(self, wx.ID_ANY,
-                                       size=(_BOX_WIDTH / 1.2, 20), style=0)
+                    ctl2 = BGTextCtrl(self, wx.ID_ANY,
+                                       size=(_BOX_WIDTH / 1.2, 20))
                     sizer.Add(ctl2, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)