Merge pull request #156 from SasView/ticket-1069

Ticket 1069: Fix for orphaned error boxes Fixes #1069
SasView · Jun 26, 2018 · 9e96dbd · 9e96dbd
2 parents 316b9c1 + dabcaf7
commit 9e96dbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/sas/sasgui/perspectives/fitting/basepage.py b/src/sas/sasgui/perspectives/fitting/basepage.py
@@ -2551,6 +2551,7 @@ def _on_disp_func(self, event=None):
             self._update_paramv_on_fit()
             # draw
             self._draw_model()
+            self.Layout()
             self.Refresh()
         except Exception:
             logger.error(traceback.format_exc())

diff --git a/src/sas/sasgui/perspectives/fitting/fitpage.py b/src/sas/sasgui/perspectives/fitting/fitpage.py
@@ -705,9 +705,8 @@ def _set_sizer_dispersion(self):
                             text2.Hide()
 
                         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),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -1997,6 +1996,7 @@ def set_data(self, data):
 
         self.on_smear_helper()
         self.on_set_focus(None)
+        self.Layout()
         self.Refresh()
         # update model plot with new data information
         if flag:
@@ -2891,8 +2891,8 @@ def custom_compare(a, b):
                     if not self.is_mac:
                         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)
                     if not self.is_mac: