Changeset 9e96dbd in sasview


Ignore:
Timestamp:
Jun 25, 2018 10:42:41 PM (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/basepage.py

    rc192960 r8a51dea0  
    25522552            # draw 
    25532553            self._draw_model() 
     2554            self.Layout() 
    25542555            self.Refresh() 
    25552556        except Exception: 
  • src/sas/sasgui/perspectives/fitting/fitpage.py

    ra7c6f38 rdabcaf7  
    706706 
    707707                        ix = 3 
    708                         ctl2 = wx.TextCtrl(self, wx.ID_ANY, 
    709                                            size=(_BOX_WIDTH / 1.3, 20), 
    710                                            style=0) 
     708                        ctl2 = BGTextCtrl(self, wx.ID_ANY, 
     709                                           size=(_BOX_WIDTH / 1.3, 20)) 
    711710 
    712711                        self.sizer4_4.Add(ctl2, (iy, ix), (1, 1), 
     
    19981997        self.on_smear_helper() 
    19991998        self.on_set_focus(None) 
     1999        self.Layout() 
    20002000        self.Refresh() 
    20012001        # update model plot with new data information 
     
    28922892                        text2.Hide() 
    28932893                    ix += 1 
    2894                     ctl2 = wx.TextCtrl(self, wx.ID_ANY, 
    2895                                        size=(_BOX_WIDTH / 1.2, 20), style=0) 
     2894                    ctl2 = BGTextCtrl(self, wx.ID_ANY, 
     2895                                       size=(_BOX_WIDTH / 1.2, 20)) 
    28962896                    sizer.Add(ctl2, (iy, ix), (1, 1), 
    28972897                              wx.EXPAND | wx.ADJUST_MINSIZE, 0) 
Note: See TracChangeset for help on using the changeset viewer.