Fix wxCheckListBox's stubborn height issues

Fixes #81 ... I hope
openscopeproject · Mar 13, 2019 · 84c4db8 · 84c4db8
1 parent b53826c
commit 84c4db8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/InteractiveHtmlBom/dialog/dialog_base.py b/InteractiveHtmlBom/dialog/dialog_base.py
@@ -311,6 +311,7 @@ def __init__( self, parent, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.
         bSizer32.Fit( self )
 
         # Connect Events
+        self.Bind( wx.EVT_SIZE, self.OnSize )
         self.m_button12.Bind( wx.EVT_BUTTON, self.OnNameFormatHintClick )
         self.m_button1.Bind( wx.EVT_BUTTON, self.OnComponentSortOrderUp )
         self.m_button2.Bind( wx.EVT_BUTTON, self.OnComponentSortOrderDown )
@@ -324,6 +325,9 @@ def __del__( self ):
 
 
     # Virtual event handlers, overide them in your derived class
+    def OnSize( self, event ):
+        event.Skip()
+
     def OnNameFormatHintClick( self, event ):
         event.Skip()
 
@@ -462,6 +466,7 @@ def __init__( self, parent, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.
         bSizer42.Fit( self )
 
         # Connect Events
+        self.Bind( wx.EVT_SIZE, self.OnSize )
         self.netlistFilePicker.Bind( wx.EVT_FILEPICKER_CHANGED, self.OnNetlistFileChanged )
         self.m_button1.Bind( wx.EVT_BUTTON, self.OnExtraFieldsUp )
         self.m_button2.Bind( wx.EVT_BUTTON, self.OnExtraFieldsDown )
@@ -472,6 +477,9 @@ def __del__( self ):
 
 
     # Virtual event handlers, overide them in your derived class
+    def OnSize( self, event ):
+        event.Skip()
+
     def OnNetlistFileChanged( self, event ):
         event.Skip()
 

diff --git a/InteractiveHtmlBom/dialog/settings_dialog.py b/InteractiveHtmlBom/dialog/settings_dialog.py
@@ -162,6 +162,13 @@ def OnNameFormatHintClick(self, event):
         wx.MessageBox(self.FILE_NAME_FORMAT_HINT, 'File name format help',
                       style=wx.ICON_NONE|wx.OK)
 
+    def OnSize(self, event):
+        # Trick the listCheckBox best size calculations
+        tmp = self.componentSortOrderBox.GetStrings()
+        self.componentSortOrderBox.SetItems([])
+        self.Layout()
+        self.componentSortOrderBox.SetItems(tmp)
+
 
 # Implementing ExtraFieldsPanelBase
 class ExtraFieldsPanel(dialog_base.ExtraFieldsPanelBase):
@@ -225,3 +232,10 @@ def OnBoardVariantFieldChange(self, event):
                 variant_set.add(field_dict[selection])
         self.boardVariantWhitelist.SetItems(list(variant_set))
         self.boardVariantBlacklist.SetItems(list(variant_set))
+
+    def OnSize(self, event):
+        # Trick the listCheckBox best size calculations
+        tmp = self.extraFieldsList.GetStrings()
+        self.extraFieldsList.SetItems([])
+        self.Layout()
+        self.extraFieldsList.SetItems(tmp)
diff --git a/InteractiveHtmlBom/dialog_test.py b/InteractiveHtmlBom/dialog_test.py
@@ -5,7 +5,7 @@ class MyApp(wx.App):
     def OnInit(self):
         frame = SettingsDialog(None, lambda x: None)
         if frame.ShowModal() == wx.ID_OK:
-            print "Should generate bom"
+            print("Should generate bom")
         frame.Destroy()
         return True
 

diff --git a/settings_dialog.fbp b/settings_dialog.fbp
@@ -1835,7 +1835,7 @@
             <event name="OnRightDown"></event>
             <event name="OnRightUp"></event>
             <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
+            <event name="OnSize">OnSize</event>
             <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="1">
                 <property name="minimum_size"></property>
@@ -3608,7 +3608,7 @@
             <event name="OnRightDown"></event>
             <event name="OnRightUp"></event>
             <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
+            <event name="OnSize">OnSize</event>
             <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="1">
                 <property name="minimum_size"></property>