Changeset 2893 for branch/2frame/GSASII.py

Timestamp:

Jul 2, 2017 9:33:22 AM (6 years ago)

Author:

vondreele

Message:

fixes to window resize issues

File:

• branch/2frame/GSASII.py (modified) (3 diffs)

branch/2frame/GSASII.py

@@ -2561 +2561 @@
         self.Status = self.CreateStatusBar()
 #TODO - split window tree on left, data on right
-        self.mainPanel = GSASIIsplit(self,-1)
+        self.mainPanel = GSASIIsplit(self,-1)        
         self.treePanel = wx.Panel(self.mainPanel, wx.ID_ANY,
             style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
-        self.treePanel.SetAutoLayout(True)
         self.dataPanel = wx.Panel(self.mainPanel, wx.ID_ANY,
             style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
-        self.dataWindow = G2gd.DataWindow(self.dataPanel)
-        self.dataWindow.SetAutoLayout(True)
-        self.dataWindow.SetInitialSize()
         self.mainPanel.SetMinimumPaneSize(100)
         self.mainPanel.SplitVertically(self.treePanel, self.dataPanel, 200)
-        self.dataFrame = self.dataWindow        #kluge!!
         
         wxID_PATTERNTREE = wx.NewId()
         treeSizer = wx.BoxSizer()
+        self.treePanel.SetSizer(treeSizer)
         self.PatternTree = G2G.G2TreeCtrl(id=wxID_PATTERNTREE,
-            parent=self.treePanel, size=self.treePanel.GetSize(),style=wx.TR_DEFAULT_STYLE )
-        treeSizer.Add(self.PatternTree,1,wx.EXPAND)
-        self.treePanel.SetSizer(treeSizer)
+            parent=self.treePanel, size=self.treePanel.GetClientSize(),style=wx.TR_DEFAULT_STYLE )
+        treeSizer.Add(self.PatternTree,1,wx.EXPAND|wx.ALL,0)
         self.PatternTree.Bind(wx.EVT_TREE_SEL_CHANGED,self.OnDataTreeSelChanged)
         self.PatternTree.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK,self.OnDataTreeSelChanged)
@@ -2596 +2591 @@
         self.root = self.PatternTree.root        
         
+        self.dataWindow = G2gd.DataWindow(self.dataPanel)
+        self.dataWindow.SetSize(self.dataPanel.GetClientSize())
+        self.dataWindow.SetAutoLayout(True)
+        self.dataWindow.SetInitialSize()
+        self.dataFrame = self.dataWindow        #kluge!!
+#        self.SetDataSize()
+        
+        
         plotFrame = wx.Frame(None,-1,'GSASII Plots',size=wx.Size(700,600), \
             style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX)
         self.G2plotNB = G2plt.G2PlotNoteBook(plotFrame,G2frame=self)
         plotFrame.Show()
-        self.SetDataSize()
         
     def __init__(self, parent):
@@ -2712 +2714 @@
         w,h = self.GetClientSizeTuple()
         self.dataWindow.SetupScrolling()
-        self.mainPanel.SetSize(wx.Size(w,h+1))
         self.mainPanel.SetSize(wx.Size(w,h))
         self.PatternTree.SetSize(wx.Size(w,h))
-        self.dataWindow.SetSize(wx.Size(w,h))
-#        self.dataWindow.Refresh()
-#        self.dataWindow.Update()
+        self.dataWindow.SetSize(self.dataPanel.GetClientSize())
         
     def SetDataSize(self):
         Size = self.GetSize()
+        self.SetSize(Size)
         Size[1] += 1        #kluge to ensure scrollbar settings & window properly displayed
-        self.SetSize(Size)
-        Size[1] -= 1        #kluge to ensure scrollbar settings & window properly displayed
         self.SetSize(Size)