After bashing my head on the desk for being so stupid I fixed the
wxFloatBar for wxGTK the extremly EASY way... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
@@ -9,256 +9,268 @@
|
|||||||
from wxPython.wx import *
|
from wxPython.wx import *
|
||||||
|
|
||||||
if wxPlatform == '__WXGTK__':
|
if wxPlatform == '__WXGTK__':
|
||||||
msg = "Due to a bug in wxGTK this class is not available on that "\
|
#
|
||||||
"platform for this release. Sorry."
|
# For wxGTK all we have to do is set the wxTB_DOCKABLE flag
|
||||||
raise ImportError, msg
|
#
|
||||||
|
class wxFloatBar(wxToolBar):
|
||||||
|
def __init__(self, parent, ID,
|
||||||
|
pos = wxDefaultPosition,
|
||||||
|
size = wxDefaultSize,
|
||||||
|
style = 0,
|
||||||
|
name = 'toolbar'):
|
||||||
|
wxToolBar.__init__(self, parent, ID, pos, size,
|
||||||
|
style|wxTB_DOCKABLE, name)
|
||||||
|
|
||||||
|
# these other methods just become no-ops
|
||||||
|
def SetFloatable(self, float):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def IsFloating(self):
|
||||||
|
return 1
|
||||||
|
|
||||||
|
def GetTitle(self):
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
_DOCKTHRESHOLD = 25
|
def SetTitle(self, title):
|
||||||
|
pass
|
||||||
|
|
||||||
class wxFloatBar(wxToolBar):
|
else:
|
||||||
"""
|
_DOCKTHRESHOLD = 25
|
||||||
wxToolBar subclass which can be dragged off its frame and later
|
|
||||||
replaced there. Drag on the toolbar to release it, close it like
|
|
||||||
a normal window to make it return to its original
|
|
||||||
position. Programmatically, call SetFloatable(true) and then
|
|
||||||
Float(true) to float, Float(false) to dock.
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self,*_args,**_kwargs):
|
class wxFloatBar(wxToolBar):
|
||||||
"""
|
"""
|
||||||
In addition to the usual arguments, wxFloatBar accepts keyword
|
wxToolBar subclass which can be dragged off its frame and later
|
||||||
args of: title(string): the title that should appear on the
|
replaced there. Drag on the toolbar to release it, close it like
|
||||||
toolbar's frame when it is floating. floatable(bool): whether
|
a normal window to make it return to its original
|
||||||
user actions (i.e., dragging) can float the toolbar or not.
|
position. Programmatically, call SetFloatable(true) and then
|
||||||
|
Float(true) to float, Float(false) to dock.
|
||||||
"""
|
"""
|
||||||
args = (self,) + _args
|
|
||||||
apply(wxToolBar.__init__, args, _kwargs)
|
|
||||||
if _kwargs.has_key('floatable'):
|
|
||||||
self.floatable = _kwargs['floatable']
|
|
||||||
assert type(self.floatable) == type(0)
|
|
||||||
else:
|
|
||||||
self.floatable = 0
|
|
||||||
self.floating = 0
|
|
||||||
if _kwargs.has_key('title'):
|
|
||||||
self.title = _kwargs['title']
|
|
||||||
assert type(self.title) == type("")
|
|
||||||
else:
|
|
||||||
self.title = ""
|
|
||||||
EVT_MOUSE_EVENTS(self, self.OnMouse)
|
|
||||||
self.parentframe = wxPyTypeCast(args[1], 'wxFrame')
|
|
||||||
|
|
||||||
|
def __init__(self,*_args,**_kwargs):
|
||||||
def IsFloatable(self):
|
"""
|
||||||
return self.floatable
|
In addition to the usual arguments, wxFloatBar accepts keyword
|
||||||
|
args of: title(string): the title that should appear on the
|
||||||
|
toolbar's frame when it is floating. floatable(bool): whether
|
||||||
def SetFloatable(self, float):
|
user actions (i.e., dragging) can float the toolbar or not.
|
||||||
self.floatable = float
|
"""
|
||||||
#Find the size of a title bar.
|
args = (self,) + _args
|
||||||
if not hasattr(self, 'titleheight'):
|
apply(wxToolBar.__init__, args, _kwargs)
|
||||||
test = wxMiniFrame(NULL, -1, "TEST")
|
if _kwargs.has_key('floatable'):
|
||||||
test.SetClientSize(wxSize(0,0))
|
self.floatable = _kwargs['floatable']
|
||||||
self.titleheight = test.GetSizeTuple()[1]
|
assert type(self.floatable) == type(0)
|
||||||
test.Destroy()
|
|
||||||
|
|
||||||
|
|
||||||
def IsFloating(self):
|
|
||||||
return self.floating
|
|
||||||
|
|
||||||
|
|
||||||
def Realize(self):
|
|
||||||
wxToolBar.Realize(self)
|
|
||||||
|
|
||||||
|
|
||||||
def GetTitle(self):
|
|
||||||
return self.title
|
|
||||||
|
|
||||||
|
|
||||||
def SetTitle(self, title):
|
|
||||||
print 'SetTitle', title
|
|
||||||
self.title = title
|
|
||||||
if self.IsFloating():
|
|
||||||
self.floatframe.SetTitle(self.title)
|
|
||||||
|
|
||||||
|
|
||||||
## def GetHome(self):
|
|
||||||
## """
|
|
||||||
## Returns the frame which this toolbar will return to when
|
|
||||||
## docked, or the parent if currently docked.
|
|
||||||
## """
|
|
||||||
## if hasattr(self, 'parentframe'):
|
|
||||||
## return self.parentframe
|
|
||||||
## else:
|
|
||||||
## return wxPyTypeCast(self.GetParent(), 'wxFrame')
|
|
||||||
|
|
||||||
|
|
||||||
## def SetHome(self, frame):
|
|
||||||
## """
|
|
||||||
## Called when docked, this will remove the toolbar from its
|
|
||||||
## current frame and attach it to another. If called when
|
|
||||||
## floating, it will dock to the frame specified when the toolbar
|
|
||||||
## window is closed.
|
|
||||||
## """
|
|
||||||
## if self.IsFloating():
|
|
||||||
## self.parentframe = frame
|
|
||||||
## self.floatframe.Reparent(frame)
|
|
||||||
## else:
|
|
||||||
## parent = wxPyTypeCast(self.GetParent(), 'wxFrame')
|
|
||||||
## self.Reparent(frame)
|
|
||||||
## parent.SetToolBar(None)
|
|
||||||
## size = parent.GetSize()
|
|
||||||
## parent.SetSize(wxSize(0,0))
|
|
||||||
## parent.SetSize(size)
|
|
||||||
## frame.SetToolBar(self)
|
|
||||||
## size = frame.GetSize()
|
|
||||||
## frame.SetSize(wxSize(0,0))
|
|
||||||
## frame.SetSize(size)
|
|
||||||
|
|
||||||
|
|
||||||
def Float(self, bool):
|
|
||||||
"Floats or docks the toolbar programmatically."
|
|
||||||
if bool:
|
|
||||||
self.parentframe = wxPyTypeCast(self.GetParent(), 'wxFrame')
|
|
||||||
print self.title
|
|
||||||
if self.title:
|
|
||||||
useStyle = wxDEFAULT_FRAME_STYLE
|
|
||||||
else:
|
else:
|
||||||
useStyle = wxTHICK_FRAME
|
self.floatable = 0
|
||||||
self.floatframe = wxFrame(self.parentframe, -1, self.title,
|
|
||||||
style = useStyle)
|
|
||||||
|
|
||||||
self.Reparent(self.floatframe)
|
|
||||||
self.parentframe.SetToolBar(None)
|
|
||||||
self.floating = 1
|
|
||||||
psize = self.parentframe.GetSize()
|
|
||||||
self.parentframe.SetSize(wxSize(0,0))
|
|
||||||
self.parentframe.SetSize(psize)
|
|
||||||
self.floatframe.SetToolBar(self)
|
|
||||||
self.oldcolor = self.GetBackgroundColour()
|
|
||||||
|
|
||||||
w = psize.width
|
|
||||||
h = self.GetSize().height
|
|
||||||
if self.title:
|
|
||||||
h = h + self.titleheight
|
|
||||||
self.floatframe.SetSize(wxSize(w,h))
|
|
||||||
self.floatframe.SetClientSize(self.GetSize())
|
|
||||||
newpos = self.parentframe.GetPosition()
|
|
||||||
newpos.y = newpos.y + _DOCKTHRESHOLD * 2
|
|
||||||
self.floatframe.SetPosition(newpos)
|
|
||||||
self.floatframe.Show(true)
|
|
||||||
|
|
||||||
EVT_CLOSE(self.floatframe, self.OnDock)
|
|
||||||
#EVT_MOVE(self.floatframe, self.OnMove)
|
|
||||||
|
|
||||||
else:
|
|
||||||
self.Reparent(self.parentframe)
|
|
||||||
self.parentframe.SetToolBar(self)
|
|
||||||
self.floating = 0
|
self.floating = 0
|
||||||
self.floatframe.SetToolBar(None)
|
if _kwargs.has_key('title'):
|
||||||
self.floatframe.Destroy()
|
self.title = _kwargs['title']
|
||||||
size = self.parentframe.GetSize()
|
assert type(self.title) == type("")
|
||||||
self.parentframe.SetSize(wxSize(0,0))
|
else:
|
||||||
self.parentframe.SetSize(size)
|
self.title = ""
|
||||||
self.SetBackgroundColour(self.oldcolor)
|
EVT_MOUSE_EVENTS(self, self.OnMouse)
|
||||||
|
self.parentframe = wxPyTypeCast(args[1], 'wxFrame')
|
||||||
|
|
||||||
|
|
||||||
def OnDock(self, e):
|
def IsFloatable(self):
|
||||||
self.Float(0)
|
return self.floatable
|
||||||
if hasattr(self, 'oldpos'):
|
|
||||||
del self.oldpos
|
|
||||||
|
|
||||||
|
|
||||||
def OnMove(self, e):
|
def SetFloatable(self, float):
|
||||||
homepos = self.parentframe.ClientToScreen(wxPoint(0,0))
|
self.floatable = float
|
||||||
floatpos = self.floatframe.GetPosition()
|
#Find the size of a title bar.
|
||||||
if (abs(homepos.x - floatpos.x) < _DOCKTHRESHOLD and
|
if not hasattr(self, 'titleheight'):
|
||||||
abs(homepos.y - floatpos.y) < _DOCKTHRESHOLD):
|
test = wxMiniFrame(NULL, -1, "TEST")
|
||||||
self.Float(0)
|
test.SetClientSize(wxSize(0,0))
|
||||||
#homepos = self.parentframe.GetPositionTuple()
|
self.titleheight = test.GetSizeTuple()[1]
|
||||||
#homepos = homepos[0], homepos[1] + self.titleheight
|
test.Destroy()
|
||||||
#floatpos = self.floatframe.GetPositionTuple()
|
|
||||||
#if abs(homepos[0] - floatpos[0]) < 35 and abs(homepos[1] - floatpos[1]) < 35:
|
|
||||||
# self._SetFauxBarVisible(true)
|
|
||||||
#else:
|
|
||||||
# self._SetFauxBarVisible(false)
|
|
||||||
|
|
||||||
|
|
||||||
def OnMouse(self, e):
|
def IsFloating(self):
|
||||||
if not self.IsFloatable():
|
return self.floating
|
||||||
e.Skip()
|
|
||||||
return
|
|
||||||
|
|
||||||
if e.ButtonDClick(1) or e.ButtonDClick(2) or e.ButtonDClick(3) or e.ButtonDown() or e.ButtonUp():
|
|
||||||
e.Skip()
|
|
||||||
|
|
||||||
if e.ButtonDown():
|
def Realize(self):
|
||||||
self.CaptureMouse()
|
wxToolBar.Realize(self)
|
||||||
self.oldpos = (e.GetX(), e.GetY())
|
|
||||||
|
|
||||||
if e.Entering():
|
|
||||||
self.oldpos = (e.GetX(), e.GetY())
|
|
||||||
|
|
||||||
if e.ButtonUp():
|
def GetTitle(self):
|
||||||
self.ReleaseMouse()
|
return self.title
|
||||||
|
|
||||||
|
|
||||||
|
def SetTitle(self, title):
|
||||||
|
print 'SetTitle', title
|
||||||
|
self.title = title
|
||||||
if self.IsFloating():
|
if self.IsFloating():
|
||||||
homepos = self.parentframe.ClientToScreen(wxPoint(0,0))
|
self.floatframe.SetTitle(self.title)
|
||||||
floatpos = self.floatframe.GetPosition()
|
|
||||||
if (abs(homepos.x - floatpos.x) < _DOCKTHRESHOLD and
|
|
||||||
abs(homepos.y - floatpos.y) < _DOCKTHRESHOLD):
|
|
||||||
self.Float(0)
|
|
||||||
return
|
|
||||||
|
|
||||||
if e.Dragging():
|
|
||||||
if not self.IsFloating():
|
|
||||||
self.Float(true)
|
|
||||||
self.oldpos = (e.GetX(), e.GetY())
|
|
||||||
else:
|
|
||||||
if hasattr(self, 'oldpos'):
|
|
||||||
loc = self.floatframe.GetPosition()
|
|
||||||
pt = wxPoint(loc.x - (self.oldpos[0]-e.GetX()), loc.y - (self.oldpos[1]-e.GetY()))
|
|
||||||
self.floatframe.Move(pt)
|
|
||||||
|
|
||||||
|
|
||||||
|
## def GetHome(self):
|
||||||
|
## """
|
||||||
|
## Returns the frame which this toolbar will return to when
|
||||||
|
## docked, or the parent if currently docked.
|
||||||
|
## """
|
||||||
|
## if hasattr(self, 'parentframe'):
|
||||||
|
## return self.parentframe
|
||||||
|
## else:
|
||||||
|
## return wxPyTypeCast(self.GetParent(), 'wxFrame')
|
||||||
|
|
||||||
def _SetFauxBarVisible(self, vis):
|
|
||||||
return
|
## def SetHome(self, frame):
|
||||||
if vis:
|
## """
|
||||||
if self.parentframe.GetToolBar() == None:
|
## Called when docked, this will remove the toolbar from its
|
||||||
if not hasattr(self, 'nullbar'):
|
## current frame and attach it to another. If called when
|
||||||
self.nullbar = wxToolBar(self.parentframe, -1)
|
## floating, it will dock to the frame specified when the toolbar
|
||||||
print "Adding fauxbar."
|
## window is closed.
|
||||||
self.nullbar.Reparent(self.parentframe)
|
## """
|
||||||
print "Reparented."
|
## if self.IsFloating():
|
||||||
self.parentframe.SetToolBar(self.nullbar)
|
## self.parentframe = frame
|
||||||
print "Set toolbar"
|
## self.floatframe.Reparent(frame)
|
||||||
col = wxNamedColour("GREY")
|
## else:
|
||||||
self.nullbar.SetBackgroundColour(col)
|
## parent = wxPyTypeCast(self.GetParent(), 'wxFrame')
|
||||||
print "Set color"
|
## self.Reparent(frame)
|
||||||
size = self.parentframe.GetSize()
|
## parent.SetToolBar(None)
|
||||||
self.parentframe.SetSize(wxSize(0,0))
|
## size = parent.GetSize()
|
||||||
self.parentframe.SetSize(size)
|
## parent.SetSize(wxSize(0,0))
|
||||||
print "Set size"
|
## parent.SetSize(size)
|
||||||
else:
|
## frame.SetToolBar(self)
|
||||||
print self.parentframe.GetToolBar()
|
## size = frame.GetSize()
|
||||||
else:
|
## frame.SetSize(wxSize(0,0))
|
||||||
if self.parentframe.GetToolBar() != None:
|
## frame.SetSize(size)
|
||||||
print "Removing fauxbar"
|
|
||||||
self.nullbar.Reparent(self.floatframe)
|
|
||||||
|
def Float(self, bool):
|
||||||
|
"Floats or docks the toolbar programmatically."
|
||||||
|
if bool:
|
||||||
|
self.parentframe = wxPyTypeCast(self.GetParent(), 'wxFrame')
|
||||||
|
print self.title
|
||||||
|
if self.title:
|
||||||
|
useStyle = wxDEFAULT_FRAME_STYLE
|
||||||
|
else:
|
||||||
|
useStyle = wxTHICK_FRAME
|
||||||
|
self.floatframe = wxFrame(self.parentframe, -1, self.title,
|
||||||
|
style = useStyle)
|
||||||
|
|
||||||
|
self.Reparent(self.floatframe)
|
||||||
self.parentframe.SetToolBar(None)
|
self.parentframe.SetToolBar(None)
|
||||||
|
self.floating = 1
|
||||||
|
psize = self.parentframe.GetSize()
|
||||||
|
self.parentframe.SetSize(wxSize(0,0))
|
||||||
|
self.parentframe.SetSize(psize)
|
||||||
|
self.floatframe.SetToolBar(self)
|
||||||
|
self.oldcolor = self.GetBackgroundColour()
|
||||||
|
|
||||||
|
w = psize.width
|
||||||
|
h = self.GetSize().height
|
||||||
|
if self.title:
|
||||||
|
h = h + self.titleheight
|
||||||
|
self.floatframe.SetSize(wxSize(w,h))
|
||||||
|
self.floatframe.SetClientSize(self.GetSize())
|
||||||
|
newpos = self.parentframe.GetPosition()
|
||||||
|
newpos.y = newpos.y + _DOCKTHRESHOLD * 2
|
||||||
|
self.floatframe.SetPosition(newpos)
|
||||||
|
self.floatframe.Show(true)
|
||||||
|
|
||||||
|
EVT_CLOSE(self.floatframe, self.OnDock)
|
||||||
|
#EVT_MOVE(self.floatframe, self.OnMove)
|
||||||
|
|
||||||
|
else:
|
||||||
|
self.Reparent(self.parentframe)
|
||||||
|
self.parentframe.SetToolBar(self)
|
||||||
|
self.floating = 0
|
||||||
|
self.floatframe.SetToolBar(None)
|
||||||
|
self.floatframe.Destroy()
|
||||||
size = self.parentframe.GetSize()
|
size = self.parentframe.GetSize()
|
||||||
self.parentframe.SetSize(wxSize(0,0))
|
self.parentframe.SetSize(wxSize(0,0))
|
||||||
self.parentframe.SetSize(size)
|
self.parentframe.SetSize(size)
|
||||||
|
self.SetBackgroundColour(self.oldcolor)
|
||||||
|
|
||||||
|
|
||||||
|
def OnDock(self, e):
|
||||||
|
self.Float(0)
|
||||||
|
if hasattr(self, 'oldpos'):
|
||||||
|
del self.oldpos
|
||||||
|
|
||||||
|
|
||||||
|
def OnMove(self, e):
|
||||||
|
homepos = self.parentframe.ClientToScreen(wxPoint(0,0))
|
||||||
|
floatpos = self.floatframe.GetPosition()
|
||||||
|
if (abs(homepos.x - floatpos.x) < _DOCKTHRESHOLD and
|
||||||
|
abs(homepos.y - floatpos.y) < _DOCKTHRESHOLD):
|
||||||
|
self.Float(0)
|
||||||
|
#homepos = self.parentframe.GetPositionTuple()
|
||||||
|
#homepos = homepos[0], homepos[1] + self.titleheight
|
||||||
|
#floatpos = self.floatframe.GetPositionTuple()
|
||||||
|
#if abs(homepos[0] - floatpos[0]) < 35 and abs(homepos[1] - floatpos[1]) < 35:
|
||||||
|
# self._SetFauxBarVisible(true)
|
||||||
|
#else:
|
||||||
|
# self._SetFauxBarVisible(false)
|
||||||
|
|
||||||
|
|
||||||
|
def OnMouse(self, e):
|
||||||
|
if not self.IsFloatable():
|
||||||
|
e.Skip()
|
||||||
|
return
|
||||||
|
|
||||||
|
if e.ButtonDClick(1) or e.ButtonDClick(2) or e.ButtonDClick(3) or e.ButtonDown() or e.ButtonUp():
|
||||||
|
e.Skip()
|
||||||
|
|
||||||
|
if e.ButtonDown():
|
||||||
|
self.CaptureMouse()
|
||||||
|
self.oldpos = (e.GetX(), e.GetY())
|
||||||
|
|
||||||
|
if e.Entering():
|
||||||
|
self.oldpos = (e.GetX(), e.GetY())
|
||||||
|
|
||||||
|
if e.ButtonUp():
|
||||||
|
self.ReleaseMouse()
|
||||||
|
if self.IsFloating():
|
||||||
|
homepos = self.parentframe.ClientToScreen(wxPoint(0,0))
|
||||||
|
floatpos = self.floatframe.GetPosition()
|
||||||
|
if (abs(homepos.x - floatpos.x) < _DOCKTHRESHOLD and
|
||||||
|
abs(homepos.y - floatpos.y) < _DOCKTHRESHOLD):
|
||||||
|
self.Float(0)
|
||||||
|
return
|
||||||
|
|
||||||
|
if e.Dragging():
|
||||||
|
if not self.IsFloating():
|
||||||
|
self.Float(true)
|
||||||
|
self.oldpos = (e.GetX(), e.GetY())
|
||||||
|
else:
|
||||||
|
if hasattr(self, 'oldpos'):
|
||||||
|
loc = self.floatframe.GetPosition()
|
||||||
|
pt = wxPoint(loc.x - (self.oldpos[0]-e.GetX()), loc.y - (self.oldpos[1]-e.GetY()))
|
||||||
|
self.floatframe.Move(pt)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def _SetFauxBarVisible(self, vis):
|
||||||
|
return
|
||||||
|
if vis:
|
||||||
|
if self.parentframe.GetToolBar() == None:
|
||||||
|
if not hasattr(self, 'nullbar'):
|
||||||
|
self.nullbar = wxToolBar(self.parentframe, -1)
|
||||||
|
print "Adding fauxbar."
|
||||||
|
self.nullbar.Reparent(self.parentframe)
|
||||||
|
print "Reparented."
|
||||||
|
self.parentframe.SetToolBar(self.nullbar)
|
||||||
|
print "Set toolbar"
|
||||||
|
col = wxNamedColour("GREY")
|
||||||
|
self.nullbar.SetBackgroundColour(col)
|
||||||
|
print "Set color"
|
||||||
|
size = self.parentframe.GetSize()
|
||||||
|
self.parentframe.SetSize(wxSize(0,0))
|
||||||
|
self.parentframe.SetSize(size)
|
||||||
|
print "Set size"
|
||||||
|
else:
|
||||||
|
print self.parentframe.GetToolBar()
|
||||||
|
else:
|
||||||
|
if self.parentframe.GetToolBar() != None:
|
||||||
|
print "Removing fauxbar"
|
||||||
|
self.nullbar.Reparent(self.floatframe)
|
||||||
|
self.parentframe.SetToolBar(None)
|
||||||
|
size = self.parentframe.GetSize()
|
||||||
|
self.parentframe.SetSize(wxSize(0,0))
|
||||||
|
self.parentframe.SetSize(size)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user