X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;ds=sidebyside;f=tree.py;h=65519735f337827dce928f9595def1e9016ec743;hb=refs%2Fheads%2F3.0;hp=d8f73a743eb499bbf7f6753cafa34a50a5192bf7;hpb=11a360f9b1d2dc97a406378cd4b49ec3b71de2a0;p=iramuteq

diff --git a/tree.py b/tree.py
index d8f73a7..67df4c3 100755
--- a/tree.py
+++ b/tree.py
@@ -123,11 +123,7 @@ class LeftTree(CT.CustomTreeCtrl):
                  style=wx.SUNKEN_BORDER|wx.WANTS_CHARS,
                  agwStyle=CT.TR_HIDE_ROOT|CT.TR_HAS_BUTTONS|CT.TR_HAS_VARIABLE_ROW_HEIGHT):
         CT.CustomTreeCtrl.__init__(self, parent, id, pos, size, style, agwStyle)
-        #FIXME : test for bigger font on HIDPI screen
-        #font = wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,
-        #       False, "", wx.FONTENCODING_DEFAULT)
-        font = wx.Font(pointSize=10, family=wx.FONTFAMILY_DEFAULT, style=wx.FONTSTYLE_NORMAL, weight=wx.FONTWEIGHT_NORMAL)
-        self.SetFont(font)
+
         ##################
         self.log = log
         alldata = dir(CT)
@@ -140,6 +136,8 @@ class LeftTree(CT.CustomTreeCtrl):
                 events.append(data)
         self.parent = parent
         self.ira = parent
+        font = wx.Font(pointSize=self.ira.fontsize + 2, family=wx.FONTFAMILY_DEFAULT, style=wx.FONTSTYLE_NORMAL, weight=wx.FONTWEIGHT_NORMAL)
+        self.SetFont(font)
         self.events = events
         self.styles = treestyles
         self.item = None
@@ -1096,7 +1094,6 @@ class LeftTree(CT.CustomTreeCtrl):
         event.Skip()
 
     def OnSelChanged(self, event = None, pydata = None):
-        print("OnSelChange")
         if event is not None :
             item = event.GetItem()
             pydata = self.GetPyData(item)
@@ -1110,7 +1107,7 @@ class LeftTree(CT.CustomTreeCtrl):
             if 'uuid' in pydata :
                 if pydata['uuid'] in ['textroot', 'matroot'] :
                     self.ira.ShowMenu('text', False)
-                    self.ira.ShowMenu('matrix', False)             
+                    self.ira.ShowMenu('matrix', False)
             self.pydata = pydata
             if pydata['uuid'] in self.parent.history.opened :
                 for i in range(self.parent.nb.GetPageCount()) :
@@ -1118,10 +1115,10 @@ class LeftTree(CT.CustomTreeCtrl):
                     if 'parametres' in dir(self.page) :
                         if self.page.parametres['uuid'] == pydata['uuid'] :
                             self.parent.nb.SetSelection(i)
+                            wx.CallAfter(self.parent.nb.SendSizeEvent)
+                            #self.parent.Refresh()
                             break
         #self.parent._mgr.Update()
-        wx.CallAfter(self.parent.nb.SendSizeEvent)
-        self.parent.Refresh()
         #if event is not None :
         #    event.Skip()