Download as
Browse Code »

Commit 1f878946926ccf4d8f0e97ca91dd3dd2ac017fb1

Authored by Thiago Franco de Moraes
1 parent 95d0842a
Exists in master

Fix dialog with combobox in mac not working when fullscreen

Showing 1 changed file with 14 additions and 14 deletions   Show diff stats
invesalius/gui/dialogs.py
  Diff comments   View file @1f87894
@@ -1887,10 +1887,10 @@ class ClutImagedataDialog(wx.Dialog): @@ -1887,10 +1887,10 @@ class ClutImagedataDialog(wx.Dialog):
1887 def __init__(self, histogram, init, end, nodes=None): 1887 def __init__(self, histogram, init, end, nodes=None):
1888 try: 1888 try:
1889 pre = wx.PreDialog() 1889 pre = wx.PreDialog()
1890 - pre.Create(wx.GetApp().GetTopWindow(), -1, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT) 1890 + pre.Create(wx.GetApp().GetTopWindow(), -1, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
1891 self.PostCreate(pre) 1891 self.PostCreate(pre)
1892 except AttributeError: 1892 except AttributeError:
1893 - wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT) 1893 + wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
1894 1894
1895 self.histogram = histogram 1895 self.histogram = histogram
1896 self.init = init 1896 self.init = init
@@ -1988,7 +1988,7 @@ class WatershedOptionsPanel(wx.Panel): @@ -1988,7 +1988,7 @@ class WatershedOptionsPanel(wx.Panel):
1988 1988
1989 1989
1990 class WatershedOptionsDialog(wx.Dialog): 1990 class WatershedOptionsDialog(wx.Dialog):
1991 - def __init__(self, config, ID=-1, title=_(u'Watershed'), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT): 1991 + def __init__(self, config, ID=-1, title=_(u'Watershed'), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP):
1992 try: 1992 try:
1993 pre = wx.PreDialog() 1993 pre = wx.PreDialog()
1994 pre.Create(wx.GetApp().GetTopWindow(), ID, title=title, style=style) 1994 pre.Create(wx.GetApp().GetTopWindow(), ID, title=title, style=style)
@@ -2116,7 +2116,7 @@ class MaskBooleanDialog(wx.Dialog): @@ -2116,7 +2116,7 @@ class MaskBooleanDialog(wx.Dialog):
2116 2116
2117 2117
2118 class ReorientImageDialog(wx.Dialog): 2118 class ReorientImageDialog(wx.Dialog):
2119 - def __init__(self, ID=-1, title=_(u'Image reorientation'), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT): 2119 + def __init__(self, ID=-1, title=_(u'Image reorientation'), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP):
2120 try: 2120 try:
2121 pre = wx.PreDialog() 2121 pre = wx.PreDialog()
2122 pre.Create(wx.GetApp().GetTopWindow(), ID, title=title, style=style) 2122 pre.Create(wx.GetApp().GetTopWindow(), ID, title=title, style=style)
@@ -2694,10 +2694,10 @@ class FFillOptionsDialog(wx.Dialog): @@ -2694,10 +2694,10 @@ class FFillOptionsDialog(wx.Dialog):
2694 def __init__(self, title, config): 2694 def __init__(self, title, config):
2695 try: 2695 try:
2696 pre = wx.PreDialog() 2696 pre = wx.PreDialog()
2697 - pre.Create(wx.GetApp().GetTopWindow(), -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT) 2697 + pre.Create(wx.GetApp().GetTopWindow(), -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
2698 self.PostCreate(pre) 2698 self.PostCreate(pre)
2699 except AttributeError: 2699 except AttributeError:
2700 - wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT) 2700 + wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
2701 2701
2702 self.config = config 2702 self.config = config
2703 2703
@@ -2807,10 +2807,10 @@ class SelectPartsOptionsDialog(wx.Dialog): @@ -2807,10 +2807,10 @@ class SelectPartsOptionsDialog(wx.Dialog):
2807 def __init__(self, config): 2807 def __init__(self, config):
2808 try: 2808 try:
2809 pre = wx.PreDialog() 2809 pre = wx.PreDialog()
2810 - pre.Create(wx.GetApp().GetTopWindow(), -1, _(u"Select mask parts"), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT) 2810 + pre.Create(wx.GetApp().GetTopWindow(), -1, _(u"Select mask parts"), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
2811 self.PostCreate(pre) 2811 self.PostCreate(pre)
2812 except AttributeError: 2812 except AttributeError:
2813 - wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, _(u"Select mask parts"), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT) 2813 + wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, _(u"Select mask parts"), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
2814 2814
2815 self.config = config 2815 self.config = config
2816 2816
@@ -2889,7 +2889,7 @@ class SelectPartsOptionsDialog(wx.Dialog): @@ -2889,7 +2889,7 @@ class SelectPartsOptionsDialog(wx.Dialog):
2889 self.Destroy() 2889 self.Destroy()
2890 2890
2891 class FFillSegmentationOptionsDialog(wx.Dialog): 2891 class FFillSegmentationOptionsDialog(wx.Dialog):
2892 - def __init__(self, config, ID=-1, title=_(u"Region growing"), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT): 2892 + def __init__(self, config, ID=-1, title=_(u"Region growing"), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP):
2893 try: 2893 try:
2894 pre = wx.PreDialog() 2894 pre = wx.PreDialog()
2895 pre.Create(wx.GetApp().GetTopWindow(), ID, title=title, style=style) 2895 pre.Create(wx.GetApp().GetTopWindow(), ID, title=title, style=style)
@@ -3094,7 +3094,7 @@ class FFillSegmentationOptionsDialog(wx.Dialog): @@ -3094,7 +3094,7 @@ class FFillSegmentationOptionsDialog(wx.Dialog):
3094 3094
3095 class CropOptionsDialog(wx.Dialog): 3095 class CropOptionsDialog(wx.Dialog):
3096 3096
3097 - def __init__(self, config, ID=-1, title=_(u"Crop mask"), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT): 3097 + def __init__(self, config, ID=-1, title=_(u"Crop mask"), style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP):
3098 self.config = config 3098 self.config = config
3099 try: 3099 try:
3100 pre = wx.PreDialog() 3100 pre = wx.PreDialog()
@@ -3217,10 +3217,10 @@ class FillHolesAutoDialog(wx.Dialog): @@ -3217,10 +3217,10 @@ class FillHolesAutoDialog(wx.Dialog):
3217 def __init__(self, title): 3217 def __init__(self, title):
3218 try: 3218 try:
3219 pre = wx.PreDialog() 3219 pre = wx.PreDialog()
3220 - pre.Create(wx.GetApp().GetTopWindow(), -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT) 3220 + pre.Create(wx.GetApp().GetTopWindow(), -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
3221 self.PostCreate(pre) 3221 self.PostCreate(pre)
3222 except AttributeError: 3222 except AttributeError:
3223 - wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT) 3223 + wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, title, style=wx.DEFAULT_DIALOG_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
3224 3224
3225 self._init_gui() 3225 self._init_gui()
3226 3226
@@ -3332,11 +3332,11 @@ class ObjectCalibrationDialog(wx.Dialog): @@ -3332,11 +3332,11 @@ class ObjectCalibrationDialog(wx.Dialog):
3332 try: 3332 try:
3333 pre = wx.PreDialog() 3333 pre = wx.PreDialog()
3334 pre.Create(wx.GetApp().GetTopWindow(), -1, _(u"Object calibration"), size=(450, 440), 3334 pre.Create(wx.GetApp().GetTopWindow(), -1, _(u"Object calibration"), size=(450, 440),
3335 - style=wx.DEFAULT_DIALOG_STYLE | wx.FRAME_FLOAT_ON_PARENT) 3335 + style=wx.DEFAULT_DIALOG_STYLE | wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
3336 self.PostCreate(pre) 3336 self.PostCreate(pre)
3337 except AttributeError: 3337 except AttributeError:
3338 wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, _(u"Object calibration"), size=(450, 440), 3338 wx.Dialog.__init__(self, wx.GetApp().GetTopWindow(), -1, _(u"Object calibration"), size=(450, 440),
3339 - style=wx.DEFAULT_DIALOG_STYLE | wx.FRAME_FLOAT_ON_PARENT) 3339 + style=wx.DEFAULT_DIALOG_STYLE | wx.FRAME_FLOAT_ON_PARENT|wx.STAY_ON_TOP)
3340 3340
3341 self._init_gui() 3341 self._init_gui()
3342 self.LoadObject() 3342 self.LoadObject()