#include "wx/aui/framemanager.h"
#include "wx/aui/dockart.h"
#include "wx/aui/floatpane.h"
+#include "wx/aui/tabmdi.h"
#ifndef WX_PRECOMP
#include "wx/panel.h"
wxAuiPaneInfo wxAuiNullPaneInfo;
wxAuiDockInfo wxAuiNullDockInfo;
-DEFINE_EVENT_TYPE(wxEVT_AUI_PANEBUTTON)
-DEFINE_EVENT_TYPE(wxEVT_AUI_PANECLOSE)
-DEFINE_EVENT_TYPE(wxEVT_AUI_PANEMAXIMIZE)
-DEFINE_EVENT_TYPE(wxEVT_AUI_PANERESTORE)
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_BUTTON)
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_CLOSE)
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_MAXIMIZE)
+DEFINE_EVENT_TYPE(wxEVT_AUI_PANE_RESTORE)
DEFINE_EVENT_TYPE(wxEVT_AUI_RENDER)
+DEFINE_EVENT_TYPE(wxEVT_AUI_FIND_MANAGER)
#ifdef __WXMAC__
// a few defines to avoid nameclashes
#endif
IMPLEMENT_DYNAMIC_CLASS(wxAuiManagerEvent, wxEvent)
+IMPLEMENT_CLASS(wxAuiManager, wxEvtHandler)
+
+
+
+const int auiToolBarLayer = 10;
+
class wxPseudoTransparentFrame : public wxFrame
{
wxRect rect(upd.GetRect());
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
- upd++;
+ ++upd;
}
}
// GetMaxLayer() is an internal function which returns
// the highest layer inside the specified dock
-static int GetMaxLayer(const wxAuiDockInfoArray& docks, int dock_direction)
+static int GetMaxLayer(const wxAuiDockInfoArray& docks,
+ int dock_direction)
{
int i, dock_count, max_layer = 0;
for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
BEGIN_EVENT_TABLE(wxAuiManager, wxEvtHandler)
- EVT_AUI_PANEBUTTON(wxAuiManager::OnPaneButton)
+ EVT_AUI_PANE_BUTTON(wxAuiManager::OnPaneButton)
EVT_AUI_RENDER(wxAuiManager::OnRender)
EVT_PAINT(wxAuiManager::OnPaint)
EVT_ERASE_BACKGROUND(wxAuiManager::OnEraseBackground)
EVT_MOTION(wxAuiManager::OnMotion)
EVT_LEAVE_WINDOW(wxAuiManager::OnLeaveWindow)
EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus)
+ EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager)
EVT_TIMER(101, wxAuiManager::OnHintFadeTimer)
END_EVENT_TABLE()
m_skipping = false;
m_has_maximized = false;
m_frame = NULL;
-
+ m_dock_constraint_x = 0.3;
+ m_dock_constraint_y = 0.3;
+ m_reserved = NULL;
+
if (managed_wnd)
{
SetManagedWindow(managed_wnd);
wxAuiManager::~wxAuiManager()
{
+ for ( size_t i = 0; i < m_panes.size(); i++ )
+ {
+ wxAuiPaneInfo& pinfo = m_panes[i];
+ if (pinfo.window && !pinfo.window->GetParent())
+ delete pinfo.window;
+ }
+
delete m_art;
}
-// Creates a floating frame for the windows
-wxAuiFloatingFrame * wxAuiManager::CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p)
+// creates a floating frame for the windows
+wxAuiFloatingFrame* wxAuiManager::CreateFloatingFrame(wxWindow* parent,
+ const wxAuiPaneInfo& pane_info)
{
- return new wxAuiFloatingFrame(parent, this, p);
+ return new wxAuiFloatingFrame(parent, this, pane_info);
+}
+
+bool wxAuiManager::CanDockPanel(const wxAuiPaneInfo & WXUNUSED(p))
+{
+ // if a key modifier is pressed while dragging the frame,
+ // don't dock the window
+ return !(wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT));
}
// GetPane() looks up a wxAuiPaneInfo structure based
// set the new flags
m_flags = flags;
-
+
if (update_hint_wnd)
{
UpdateHintWindowConfig();
}
+// this function will return the aui manager for a given
+// window. The |window| parameter should be any child window
+// or grand-child window (and so on) of the frame/window
+// managed by wxAuiManager. The |window| parameter does not
+// need to be managed by the manager itself.
+wxAuiManager* wxAuiManager::GetManager(wxWindow* window)
+{
+ wxAuiManagerEvent evt(wxEVT_AUI_FIND_MANAGER);
+ evt.SetManager(NULL);
+ evt.ResumePropagation(wxEVENT_PROPAGATE_MAX);
+ if (!window->ProcessEvent(evt))
+ return NULL;
+
+ return evt.GetManager();
+}
+
+
void wxAuiManager::UpdateHintWindowConfig()
{
// find out if the the system can do transparent frames
bool can_do_transparent = false;
-
+
wxWindow* w = m_frame;
while (w)
{
if (w->IsKindOf(CLASSINFO(wxFrame)))
{
wxFrame* f = static_cast<wxFrame*>(w);
- #if wxCHECK_VERSION(2,7,0)
can_do_transparent = f->CanSetTransparent();
- #endif
break;
}
-
+
w = w->GetParent();
}
-
+
// if there is an existing hint window, delete it
if (m_hint_wnd)
{
m_hint_fademax = 50;
m_hint_wnd = NULL;
-
+
if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) && can_do_transparent)
- {
+ {
// Make a window to use for a transparent hint
#if defined(__WXMSW__) || defined(__WXGTK__)
m_hint_wnd = new wxFrame(m_frame, wxID_ANY, wxEmptyString,
// blue.
p->SetBackgroundColour(*wxBLUE);
#endif
-
+
}
- else
+ else
{
if ((m_flags & wxAUI_MGR_TRANSPARENT_HINT) != 0 ||
(m_flags & wxAUI_MGR_VENETIAN_BLINDS_HINT) != 0)
wxAuiPaneInfo().Name(wxT("mdiclient")).
CenterPane().PaneBorder(false));
}
+ else if (m_frame->IsKindOf(CLASSINFO(wxAuiMDIParentFrame)))
+ {
+ wxAuiMDIParentFrame* mdi_frame = (wxAuiMDIParentFrame*)m_frame;
+ wxAuiMDIClientWindow* client_window = mdi_frame->GetClientWindow();
+ wxASSERT_MSG(client_window, wxT("Client window is NULL!"));
+
+ AddPane(client_window,
+ wxAuiPaneInfo().Name(wxT("mdiclient")).
+ CenterPane().PaneBorder(false));
+ }
+
#endif
UpdateHintWindowConfig();
if (!window)
return false;
- // check if the pane already exists
+ // check if the window is already managed by us
if (GetPane(pane_info.window).IsOk())
return false;
+ // check if the pane name already exists, this could reveal a
+ // bug in the library user's application
+ bool already_exists = false;
+ if (!pane_info.name.empty() && GetPane(pane_info.name).IsOk())
+ {
+ wxFAIL_MSG(wxT("A pane with that name already exists in the manager!"));
+ already_exists = true;
+ }
+
// if the new pane is docked then we should undo maximize
- if(pane_info.IsDocked())
+ if (pane_info.IsDocked())
RestoreMaximizedPane();
m_panes.Add(pane_info);
// set the pane window
pinfo.window = window;
+
// if the pane's name identifier is blank, create a random string
- if (pinfo.name.empty())
+ if (pinfo.name.empty() || already_exists)
{
pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"),
((unsigned long)pinfo.window) & 0xffffffff,
pinfo.buttons.Add(button);
}
+ if (pinfo.HasPinButton())
+ {
+ wxAuiPaneButton button;
+ button.button_id = wxAUI_BUTTON_PIN;
+ pinfo.buttons.Add(button);
+ }
+
if (pinfo.HasCloseButton())
{
wxAuiPaneButton button;
// I believe this to be the correct action, until
// wxToolBar::GetBestSize() is fixed. Is this assumption
// correct?
- pinfo.best_size.y++;
+ // commented out by JACS 2007-9-08 after having added a pixel in wxMSW's wxToolBar::DoGetBestSize()
+ // pinfo.best_size.y++;
}
if (pinfo.min_size != wxDefaultSize)
}
bool wxAuiManager::AddPane(wxWindow* window,
- int direction,
- const wxString& caption)
+ int direction,
+ const wxString& caption)
{
wxAuiPaneInfo pinfo;
pinfo.Caption(caption);
}
bool wxAuiManager::AddPane(wxWindow* window,
- const wxAuiPaneInfo& pane_info,
- const wxPoint& drop_pos)
+ const wxAuiPaneInfo& pane_info,
+ const wxPoint& drop_pos)
{
if (!AddPane(window, pane_info))
return false;
{
return AddPane(window, pane_info);
}
- else
+ else
{
if (pane_info.IsFloating())
{
if (pane_info.floating_size != wxDefaultSize)
existing_pane.FloatingSize(pane_info.floating_size);
}
- else
+ else
{
// if the new pane is docked then we should undo maximize
RestoreMaximizedPane();
p.frame->Show(false);
// reparent to m_frame and destroy the pane
- if(m_action_window == p.frame) {
+ if (m_action_window == p.frame)
+ {
m_action_window = NULL;
}
+
p.window->Reparent(m_frame);
p.frame->SetSizer(NULL);
p.frame->Destroy();
void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)
{
// if we were maximized, restore
- if(pane_info.IsMaximized()) {
+ if (pane_info.IsMaximized())
+ {
RestorePane(pane_info);
}
// first, hide the window
- if (pane_info.window && pane_info.window->IsShown()) {
+ if (pane_info.window && pane_info.window->IsShown())
+ {
pane_info.window->Show(false);
}
// make sure that we are the parent of this window
- if(pane_info.window && pane_info.window->GetParent() != m_frame) {
+ if (pane_info.window && pane_info.window->GetParent() != m_frame)
+ {
pane_info.window->Reparent(m_frame);
}
// if we have a frame, destroy it
- if(pane_info.frame) {
+ if (pane_info.frame)
+ {
pane_info.frame->Destroy();
pane_info.frame = NULL;
}
// now we need to either destroy or hide the pane
- if(pane_info.IsDestroyOnClose())
+ if (pane_info.IsDestroyOnClose())
{
wxWindow * window = pane_info.window;
DetachPane(window);
- if(window) {
+ if (window)
+ {
window->Destroy();
}
- }
- else
+ }
+ else
{
pane_info.Hide();
}
for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
{
wxAuiPaneInfo& p = m_panes.Item(i);
- if(!p.IsToolbar()) {
+ if (!p.IsToolbar())
+ {
p.Restore();
- p.SaveHidden();
+
+ // save hidden state
+ p.SetFlag(wxAuiPaneInfo::savedHiddenState,
+ p.HasFlag(wxAuiPaneInfo::optionHidden));
+
+ // hide the pane, because only the newly
+ // maximized pane should show
p.Hide();
}
}
m_has_maximized = true;
// last, show the window
- if (pane_info.window && !pane_info.window->IsShown()) {
+ if (pane_info.window && !pane_info.window->IsShown())
+ {
pane_info.window->Show(true);
}
}
for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
{
wxAuiPaneInfo& p = m_panes.Item(i);
- if(!p.IsToolbar()) {
- p.RestoreHidden();
+ if (!p.IsToolbar())
+ {
+ p.SetFlag(wxAuiPaneInfo::optionHidden,
+ p.HasFlag(wxAuiPaneInfo::savedHiddenState));
}
}
m_has_maximized = false;
// last, show the window
- if (pane_info.window && !pane_info.window->IsShown()) {
+ if (pane_info.window && !pane_info.window->IsShown())
+ {
pane_info.window->Show(true);
}
}
for (i = 0, pane_count = m_panes.GetCount(); i < pane_count; ++i)
{
wxAuiPaneInfo& p = m_panes.Item(i);
- if(p.IsMaximized()) {
+ if (p.IsMaximized())
+ {
RestorePane(p);
break;
}
{
wxString result;
result.Alloc(500);
- result = wxT("layout1|");
+ result = wxT("layout2|");
int pane_i, pane_count = m_panes.GetCount();
for (pane_i = 0; pane_i < pane_count; ++pane_i)
wxString part;
// check layout string version
+ // 'layout1' = wxAUI 0.9.0 - wxAUI 0.9.2
+ // 'layout2' = wxAUI 0.9.2 (wxWidgets 2.8)
part = input.BeforeFirst(wxT('|'));
input = input.AfterFirst(wxT('|'));
part.Trim(true);
part.Trim(false);
- if (part != wxT("layout1"))
+ if (part != wxT("layout2"))
return false;
// mark all panes currently managed as docked and hidden
}
void wxAuiManager::GetPanePositionsAndSizes(wxAuiDockInfo& dock,
- wxArrayInt& positions,
- wxArrayInt& sizes)
+ wxArrayInt& positions,
+ wxArrayInt& sizes)
{
- int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
- int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
- int gripper_size = m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
+ int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
+ int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+ int gripper_size = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
positions.Empty();
sizes.Empty();
size += gripper_size;
size += pane.best_size.x;
}
- else
+ else
{
if (pane.HasGripper() && pane.HasGripperTop())
size += gripper_size;
if (amount >= 0)
offset += amount;
- else
+ else
positions[pane_i] -= -amount;
offset += sizes[pane_i];
int amount = positions[pane_i] - offset;
if (amount >= 0)
offset += amount;
- else
+ else
positions[pane_i] += -amount;
offset += sizes[pane_i];
void wxAuiManager::LayoutAddPane(wxSizer* cont,
- wxAuiDockInfo& dock,
- wxAuiPaneInfo& pane,
- wxAuiDockUIPartArray& uiparts,
- bool spacer_only)
+ wxAuiDockInfo& dock,
+ wxAuiPaneInfo& pane,
+ wxAuiDockUIPartArray& uiparts,
+ bool spacer_only)
{
wxAuiDockUIPart part;
wxSizerItem* sizer_item;
- int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
- int gripper_size = m_art->GetMetric(wxAUI_ART_GRIPPER_SIZE);
- int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
- int pane_button_size = m_art->GetMetric(wxAUI_ART_PANE_BUTTON_SIZE);
+ int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
+ int gripper_size = m_art->GetMetric(wxAUI_DOCKART_GRIPPER_SIZE);
+ int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+ int pane_button_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BUTTON_SIZE);
// find out the orientation of the item (orientation for panes
// is the same as the dock's orientation)
int orientation;
if (dock.IsHorizontal())
orientation = wxHORIZONTAL;
- else
+ else
orientation = wxVERTICAL;
// this variable will store the proportion
part.sizer_item = sizer_item;
uiparts.Add(part);
}
-
+
// if we have buttons, add a little space to the right
// of them to ease visual crowding
if (button_count >= 1)
// determine if the pane should have a minimum size; if the pane is
- // non-resizable (fixed) then we must set a minimum size. Alternitavely,
+ // non-resizable (fixed) then we must set a minimum size. Alternatively,
// if the pane.min_size is set, we must use that value as well
wxSize min_size = pane.min_size;
}
void wxAuiManager::LayoutAddDock(wxSizer* cont,
- wxAuiDockInfo& dock,
- wxAuiDockUIPartArray& uiparts,
- bool spacer_only)
+ wxAuiDockInfo& dock,
+ wxAuiDockUIPartArray& uiparts,
+ bool spacer_only)
{
wxSizerItem* sizer_item;
wxAuiDockUIPart part;
- int sash_size = m_art->GetMetric(wxAUI_ART_SASH_SIZE);
+ int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE);
int orientation = dock.IsHorizontal() ? wxHORIZONTAL : wxVERTICAL;
// resizable bottom and right docks have a sash before them
{
wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));
int pane_pos = pane_positions.Item(pane_i);
- if(pane.IsMaximized()) {
+
+ if (pane.IsMaximized())
has_maximized_pane = true;
- }
+
int amount = pane_pos - offset;
if (amount > 0)
{
if (dock.IsVertical())
sizer_item = dock_sizer->Add(1, amount, 0, wxEXPAND);
- else
+ else
sizer_item = dock_sizer->Add(amount, 1, 0, wxEXPAND);
part.type = wxAuiDockUIPart::typeBackground;
}
// at the end add a very small stretchable background area
- sizer_item = dock_sizer->Add(1,1, 1, wxEXPAND);
+ sizer_item = dock_sizer->Add(0,0, 1, wxEXPAND);
part.type = wxAuiDockUIPart::typeBackground;
part.dock = &dock;
for (pane_i = 0; pane_i < pane_count; ++pane_i)
{
wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));
- if(pane.IsMaximized()) {
+
+ if (pane.IsMaximized())
has_maximized_pane = true;
- }
// if this is not the first pane being added,
// we need to add a pane sizer
if (dock.dock_direction == wxAUI_DOCK_CENTER || has_maximized_pane)
sizer_item = cont->Add(dock_sizer, 1, wxEXPAND);
- else
+ else
sizer_item = cont->Add(dock_sizer, 0, wxEXPAND);
part.type = wxAuiDockUIPart::typeDock;
if (dock.IsHorizontal())
cont->SetItemMinSize(dock_sizer, 0, dock.size);
- else
+ else
cont->SetItemMinSize(dock_sizer, dock.size, 0);
// top and left docks have a sash after them
- if (!m_has_maximized && !dock.fixed && (dock.dock_direction == wxAUI_DOCK_TOP ||
- dock.dock_direction == wxAUI_DOCK_LEFT))
+ if (!m_has_maximized &&
+ !dock.fixed &&
+ (dock.dock_direction == wxAUI_DOCK_TOP ||
+ dock.dock_direction == wxAUI_DOCK_LEFT))
{
sizer_item = cont->Add(sash_size, sash_size, 0, wxEXPAND);
}
wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
- wxAuiDockInfoArray& docks,
- wxAuiDockUIPartArray& uiparts,
- bool spacer_only)
+ wxAuiDockInfoArray& docks,
+ wxAuiDockUIPartArray& uiparts,
+ bool spacer_only)
{
wxBoxSizer* container = new wxBoxSizer(wxVERTICAL);
- int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
- int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
+ int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+ int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
wxSize cli_size = m_frame->GetClientSize();
int i, dock_count, pane_count;
// empty all docks out
for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
- docks.Item(i).panes.Empty();
+ {
+ wxAuiDockInfo& dock = docks.Item(i);
+
+ // empty out all panes, as they will be readded below
+ dock.panes.Empty();
+
+ if (dock.fixed)
+ {
+ // always reset fixed docks' sizes, because
+ // the contained windows may have been resized
+ dock.size = 0;
+ }
+ }
// iterate through all known panes, filing each
{
wxAuiPaneInfo& p = panes.Item(i);
- // find any docks in this layer
+ // find any docks with the same dock direction, dock layer, and
+ // dock row as the pane we are working on
wxAuiDockInfo* dock;
wxAuiDockInfoPtrArray arr;
FindDocks(docks, p.dock_direction, p.dock_layer, p.dock_row, arr);
if (arr.GetCount() > 0)
{
+ // found the right dock
dock = arr.Item(0);
}
- else
+ else
{
// dock was not found, so we need to create a new one
wxAuiDockInfo d;
if (!FindPaneInDock(*dock, p.window))
dock->panes.Add(&p);
}
- else
+ else
{
// remove the pane from any existing docks
RemovePaneFromDocks(docks, p);
if (dock.IsHorizontal())
size = wxMax(pane_size.y, size);
- else
+ else
size = wxMax(pane_size.x, size);
}
}
}
- // new dock's size may not be more than 1/3 of the frame size
+
+ // new dock's size may not be more than the dock constraint
+ // parameter specifies. See SetDockSizeConstraint()
+
+ int max_dock_x_size = (int)(m_dock_constraint_x * ((double)cli_size.x));
+ int max_dock_y_size = (int)(m_dock_constraint_y * ((double)cli_size.y));
+
if (dock.IsHorizontal())
- size = wxMin(size, cli_size.y/3);
- else
- size = wxMin(size, cli_size.x/3);
+ size = wxMin(size, max_dock_y_size);
+ else
+ size = wxMin(size, max_dock_x_size);
+ // absolute minimum size for a dock is 10 pixels
if (size < 10)
size = 10;
+
dock.size = size;
}
if (pane.min_size.y > dock_min_size)
dock_min_size = pane.min_size.y;
}
- else
+ else
{
if (pane.min_size.x > dock_min_size)
dock_min_size = pane.min_size.x;
// if the dock mode is fixed, and none of the panes
// are being moved right now, make sure the panes
// do not overlap each other. If they do, we will
- // adjust the panes' positions
+ // adjust the positions of the panes
if (dock.fixed && !action_pane_marked)
{
wxArrayInt pane_positions, pane_sizes;
int amount = pane.dock_pos - offset;
if (amount >= 0)
offset += amount;
- else
+ else
pane.dock_pos += -amount;
offset += pane_sizes[j];
for (row = 0,row_count = arr.GetCount(); row<row_count; ++row)
LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
}
- else if (!m_has_maximized)
+ else if (!m_has_maximized)
{
// there are no center docks, add a background area
wxSizerItem* sizer_item = middle->Add(1,1, 1, wxEXPAND);
uiparts.Add(part);
}
}
- else
+ else
{
middle->Add(old_cont, 1, wxEXPAND);
}
}
+// SetDockSizeConstraint() allows the dock constraints to be set. For example,
+// specifying values of 0.5, 0.5 will mean that upon dock creation, a dock may
+// not be larger than half of the window's size
+
+void wxAuiManager::SetDockSizeConstraint(double width_pct, double height_pct)
+{
+ m_dock_constraint_x = wxMax(0.0, wxMin(1.0, width_pct));
+ m_dock_constraint_y = wxMax(0.0, wxMin(1.0, height_pct));
+}
+
+void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct) const
+{
+ if (width_pct)
+ *width_pct = m_dock_constraint_x;
+
+ if (height_pct)
+ *height_pct = m_dock_constraint_y;
+}
+
+
+
// Update() updates the layout. Whenever changes are made to
// one or more panes, this function should be called. It is the
// external entry point for running the layout engine.
wxSizer* sizer;
int i, pane_count = m_panes.GetCount();
- // delete old sizer first
- m_frame->SetSizer(NULL);
// destroy floating panes which have been
// redocked or are becoming non-floating
p.window->SetSize(1,1);
- // the following block is a workaround for bug #1531361
- // (see wxWidgets sourceforge page). On wxGTK (only), when
- // a frame is shown/hidden, a move event unfortunately
- // also gets fired. Because we may be dragging around
- // a pane, we need to cancel that action here to prevent
- // a spurious crash.
- if (m_action_window == p.frame)
- {
- if (wxWindow::GetCapture() == m_frame)
+ // the following block is a workaround for bug #1531361
+ // (see wxWidgets sourceforge page). On wxGTK (only), when
+ // a frame is shown/hidden, a move event unfortunately
+ // also gets fired. Because we may be dragging around
+ // a pane, we need to cancel that action here to prevent
+ // a spurious crash.
+ if (m_action_window == p.frame)
+ {
+ if (wxWindow::GetCapture() == m_frame)
m_frame->ReleaseMouse();
m_action = actionNone;
- m_action_window = NULL;
- }
+ m_action_window = NULL;
+ }
- // hide the frame
+ // hide the frame
if (p.frame->IsShown())
p.frame->Show(false);
// reparent to m_frame and destroy the pane
- if(m_action_window == p.frame)
+ if (m_action_window == p.frame)
{
m_action_window = NULL;
}
-
+
p.window->Reparent(m_frame);
p.frame->SetSizer(NULL);
p.frame->Destroy();
}
+ // delete old sizer first
+ m_frame->SetSizer(NULL);
+
// create a layout for all of the panes
sizer = LayoutAll(m_panes, m_docks, m_uiparts, false);
// pane, which has recently been floated
wxAuiFloatingFrame* frame = CreateFloatingFrame(m_frame, p);
-#if wxCHECK_VERSION(2,7,0)
// on MSW and Mac, if the owner desires transparent dragging, and
// the dragging is happening right now, then the floating
// window should have this style by default
if (m_action == actionDragFloatingPane &&
(m_flags & wxAUI_MGR_TRANSPARENT_DRAG))
frame->SetTransparent(150);
-#endif
frame->SetPaneWindow(p);
p.frame = frame;
if (p.IsShown() && !frame->IsShown())
frame->Show();
}
- else
+ else
{
// frame already exists, make sure it's position
// and size reflect the information in wxAuiPaneInfo
- if (p.frame->GetPosition() != p.floating_pos)
+ if ((p.frame->GetPosition() != p.floating_pos) || (p.frame->GetSize() != p.floating_size))
{
+ p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
+ p.floating_size.x, p.floating_size.y,
+ wxSIZE_USE_EXISTING);
+ /*
p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
wxDefaultCoord, wxDefaultCoord,
wxSIZE_USE_EXISTING);
//p.frame->Move(p.floating_pos.x, p.floating_pos.y);
+ */
}
if (p.frame->IsShown() != p.IsShown())
p.frame->Show(p.IsShown());
}
}
- else
+ else
{
if (p.window->IsShown() != p.IsShown())
p.window->Show(p.IsShown());
{
if (dock.IsVertical())
return dock.rect.y;
- else
+ else
return dock.rect.x;
}
}
// the target info. If the operation was allowed, the function returns true.
bool wxAuiManager::ProcessDockResult(wxAuiPaneInfo& target,
- const wxAuiPaneInfo& new_pos)
+ const wxAuiPaneInfo& new_pos)
{
bool allowed = false;
switch (new_pos.dock_direction)
const int auiLayerInsertOffset = 5;
bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
- wxAuiPaneInfoArray& panes,
- wxAuiPaneInfo& target,
- const wxPoint& pt,
- const wxPoint& offset)
+ wxAuiPaneInfoArray& panes,
+ wxAuiPaneInfo& target,
+ const wxPoint& pt,
+ const wxPoint& offset)
{
wxSize cli_size = m_frame->GetClientSize();
int layer_insert_offset = auiLayerInsertOffset;
- if (target.IsToolbar())
+ if (drop.IsToolbar())
layer_insert_offset = 0;
+
if (pt.x < layer_insert_offset &&
pt.x > layer_insert_offset-auiLayerInsertPixels)
{
+ int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_LEFT),
+ GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)),
+ GetMaxLayer(docks, wxAUI_DOCK_TOP)) + 1;
+
+ if (drop.IsToolbar())
+ new_layer = auiToolBarLayer;
+
drop.Dock().Left().
+ Layer(new_layer).
Row(0).
Position(pt.y - GetDockPixelOffset(drop) - offset.y);
return ProcessDockResult(target, drop);
else if (pt.y < layer_insert_offset &&
pt.y > layer_insert_offset-auiLayerInsertPixels)
{
+ int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_TOP),
+ GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
+ GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
+
+ if (drop.IsToolbar())
+ new_layer = auiToolBarLayer;
+
drop.Dock().Top().
+ Layer(new_layer).
Row(0).
Position(pt.x - GetDockPixelOffset(drop) - offset.x);
return ProcessDockResult(target, drop);
else if (pt.x >= cli_size.x - layer_insert_offset &&
pt.x < cli_size.x - layer_insert_offset + auiLayerInsertPixels)
{
+ int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
+ GetMaxLayer(docks, wxAUI_DOCK_TOP)),
+ GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1;
+
+ if (drop.IsToolbar())
+ new_layer = auiToolBarLayer;
+
drop.Dock().Right().
+ Layer(new_layer).
Row(0).
Position(pt.y - GetDockPixelOffset(drop) - offset.y);
return ProcessDockResult(target, drop);
GetMaxLayer(docks, wxAUI_DOCK_LEFT)),
GetMaxLayer(docks, wxAUI_DOCK_RIGHT)) + 1;
+ if (drop.IsToolbar())
+ new_layer = auiToolBarLayer;
+
drop.Dock().Bottom().
Layer(new_layer).
Row(0).
return ProcessDockResult(target, drop);
}
+
wxAuiDockUIPart* part = HitTest(pt.x, pt.y);
int dock_drop_offset = 0;
if (part->dock->IsHorizontal())
dock_drop_offset = pt.x - part->dock->rect.x - offset.x;
- else
+ else
dock_drop_offset = pt.y - part->dock->rect.y - offset.y;
return ProcessDockResult(target, drop);
}
- else
- {
- m_skipping = false;
- }
- if (!m_skipping)
- {
- m_last_rect = part->dock->rect;
- m_last_rect.Inflate( 15, 15 );
- }
+ m_skipping = false;
+
+ m_last_rect = part->dock->rect;
+ m_last_rect.Inflate( 15, 15 );
drop.Dock().
Direction(part->dock->dock_direction).
insert_layer = 0;
insert_dock_row = true;
- if (pt.x >= part->rect.x &&
- pt.x < part->rect.x+new_row_pixels_x)
- insert_dir = wxAUI_DOCK_LEFT;
- else
- if (pt.y >= part->rect.y &&
- pt.y < part->rect.y+new_row_pixels_y)
- insert_dir = wxAUI_DOCK_TOP;
- else
- if (pt.x >= part->rect.x + part->rect.width-new_row_pixels_x &&
- pt.x < part->rect.x + part->rect.width)
- insert_dir = wxAUI_DOCK_RIGHT;
- else
- if (pt.y >= part->rect.y+ part->rect.height-new_row_pixels_y &&
- pt.y < part->rect.y + part->rect.height)
- insert_dir = wxAUI_DOCK_BOTTOM;
- else
- return false;
+ const wxRect& pr = part->rect;
+ if (pt.x >= pr.x && pt.x < pr.x + new_row_pixels_x)
+ insert_dir = wxAUI_DOCK_LEFT;
+ else if (pt.y >= pr.y && pt.y < pr.y + new_row_pixels_y)
+ insert_dir = wxAUI_DOCK_TOP;
+ else if (pt.x >= pr.x + pr.width - new_row_pixels_x &&
+ pt.x < pr.x + pr.width)
+ insert_dir = wxAUI_DOCK_RIGHT;
+ else if (pt.y >= pr.y+ pr.height - new_row_pixels_y &&
+ pt.y < pr.y + pr.height)
+ insert_dir = wxAUI_DOCK_BOTTOM;
+ else
+ return false;
insert_row = GetMaxRow(panes, insert_dir, insert_layer) + 1;
}
offset = pt.y - part->rect.y;
size = part->rect.GetHeight();
}
- else
+ else
{
offset = pt.x - part->rect.x;
size = part->rect.GetWidth();
}
m_hint_fadeamt += 4;
-#if wxCHECK_VERSION(2,7,0)
m_hint_wnd->SetTransparent(m_hint_fadeamt);
-#else
- if (m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame)))
- ((wxPseudoTransparentFrame *)m_hint_wnd)->SetTransparent(m_hint_fadeamt);
-#endif
}
void wxAuiManager::ShowHint(const wxRect& rect)
m_last_hint = rect;
m_hint_fadeamt = m_hint_fademax;
-
+
if ((m_flags & wxAUI_MGR_HINT_FADE)
&& !((m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame))) &&
(m_flags & wxAUI_MGR_NO_VENETIAN_BLINDS_FADE))
m_hint_fadeamt = 0;
m_hint_wnd->SetSize(rect);
+ m_hint_wnd->SetTransparent(m_hint_fadeamt);
if (!m_hint_wnd->IsShown())
m_hint_wnd->Show();
if (m_action == actionDragFloatingPane && m_action_window)
m_action_window->SetFocus();
-#if wxCHECK_VERSION(2,7,0)
- m_hint_wnd->SetTransparent(m_hint_fadeamt);
-#else
- if (m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame)))
- ((wxPseudoTransparentFrame*)m_hint_wnd)->SetTransparent(m_hint_fadeamt);
-#endif
m_hint_wnd->Raise();
m_hint_fadetimer.Start(5);
}
}
- else // Not using a transparent hint window...
+ else // Not using a transparent hint window...
{
if (!(m_flags & wxAUI_MGR_RECTANGLE_HINT))
return;
-
+
if (m_last_hint != rect)
{
// remove the last hint rectangle
{
if (m_hint_wnd->IsShown())
m_hint_wnd->Show(false);
-#if wxCHECK_VERSION(2,7,0)
m_hint_wnd->SetTransparent(0);
-#else
- if (m_hint_wnd->IsKindOf(CLASSINFO(wxPseudoTransparentFrame)))
- ((wxPseudoTransparentFrame *)m_hint_wnd)->SetTransparent(0);
-#endif
m_hint_fadetimer.Stop();
m_last_hint = wxRect();
return;
-// DrawHintRect() draws a drop hint rectangle. First calls DoDrop() to
-// determine the exact position the pane would be at were if dropped. If
-// the pame would indeed become docked at the specified drop point,
-// DrawHintRect() then calls ShowHint() to indicate this drop rectangle.
-// "pane_window" is the window pointer of the pane being dragged, pt is
-// the mouse position, in client coordinates
-void wxAuiManager::DrawHintRect(wxWindow* pane_window,
- const wxPoint& pt,
- const wxPoint& offset)
+void wxAuiManager::StartPaneDrag(wxWindow* pane_window,
+ const wxPoint& offset)
+{
+ wxAuiPaneInfo& pane = GetPane(pane_window);
+ if (!pane.IsOk())
+ return;
+
+ if (pane.IsToolbar())
+ {
+ m_action = actionDragToolbarPane;
+ }
+ else
+ {
+ m_action = actionDragFloatingPane;
+ }
+
+ m_action_window = pane_window;
+ m_action_offset = offset;
+ m_frame->CaptureMouse();
+}
+
+
+// CalculateHintRect() calculates the drop hint rectangle. The method
+// first calls DoDrop() to determine the exact position the pane would
+// be at were if dropped. If the pane would indeed become docked at the
+// specified drop point, the the rectangle hint will be returned in
+// screen coordinates. Otherwise, an empty rectangle is returned.
+// |pane_window| is the window pointer of the pane being dragged, |pt| is
+// the mouse position, in client coordinates. |offset| describes the offset
+// that the mouse is from the upper-left corner of the item being dragged
+
+wxRect wxAuiManager::CalculateHintRect(wxWindow* pane_window,
+ const wxPoint& pt,
+ const wxPoint& offset)
{
wxRect rect;
wxAuiDockUIPartArray uiparts;
wxAuiPaneInfo hint = GetPane(pane_window);
hint.name = wxT("__HINT__");
+ hint.PaneBorder(true);
hint.Show();
if (!hint.IsOk())
- return;
+ return rect;
CopyDocksAndPanes(docks, panes, m_docks, m_panes);
// find out where the new pane would be
if (!DoDrop(docks, panes, hint, pt, offset))
{
- HideHint();
- return;
+ return rect;
}
panes.Add(hint);
if (rect.IsEmpty())
{
- HideHint();
- return;
+ return rect;
}
// actually show the hint rectangle on the screen
m_frame->ClientToScreen(&rect.x, &rect.y);
- ShowHint(rect);
+
+ if ( m_frame->GetLayoutDirection() == wxLayout_RightToLeft )
+ {
+ // Mirror rectangle in RTL mode
+ rect.x -= rect.GetWidth();
+ }
+
+ return rect;
+}
+
+// DrawHintRect() calculates the hint rectangle by calling
+// CalculateHintRect(). If there is a rectangle, it shows it
+// by calling ShowHint(), otherwise it hides any hint
+// rectangle currently shown
+void wxAuiManager::DrawHintRect(wxWindow* pane_window,
+ const wxPoint& pt,
+ const wxPoint& offset)
+{
+ wxRect rect = CalculateHintRect(pane_window, pt, offset);
+
+ if (rect.IsEmpty())
+ {
+ HideHint();
+ }
+ else
+ {
+ ShowHint(rect);
+ }
}
void wxAuiManager::OnFloatingPaneMoveStart(wxWindow* wnd)
wxAuiPaneInfo& pane = GetPane(wnd);
wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
-#if wxCHECK_VERSION(2,7,0)
if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
pane.frame->SetTransparent(150);
-#endif
}
void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
pt.y = pos.y;
// and some more pixels for the title bar
pt.y -= 5;
- } else
- if (dir == wxWEST)
+ }
+ else if (dir == wxWEST)
{
// move to pane's left border
wxPoint pos( 0,0 );
pos = wnd->ClientToScreen( pos );
pt.x = pos.x;
- } else
- if (dir == wxEAST)
+ }
+ else if (dir == wxEAST)
{
// move to pane's right border
wxPoint pos( wnd->GetSize().x, 0 );
pos = wnd->ClientToScreen( pos );
pt.x = pos.x;
- } else
- if (dir == wxSOUTH)
+ }
+ else if (dir == wxSOUTH)
{
// move to pane's bottom border
wxPoint pos( 0, wnd->GetSize().y );
// no hint for toolbar floating windows
if (pane.IsToolbar() && m_action == actionDragFloatingPane)
{
- if (m_action == actionDragFloatingPane)
- {
- wxAuiDockInfoArray docks;
- wxAuiPaneInfoArray panes;
- wxAuiDockUIPartArray uiparts;
- wxAuiPaneInfo hint = pane;
+ wxAuiDockInfoArray docks;
+ wxAuiPaneInfoArray panes;
+ wxAuiDockUIPartArray uiparts;
+ wxAuiPaneInfo hint = pane;
- CopyDocksAndPanes(docks, panes, m_docks, m_panes);
+ CopyDocksAndPanes(docks, panes, m_docks, m_panes);
- // find out where the new pane would be
- if (!DoDrop(docks, panes, hint, client_pt))
- return;
- if (hint.IsFloating())
- return;
+ // find out where the new pane would be
+ if (!DoDrop(docks, panes, hint, client_pt))
+ return;
+ if (hint.IsFloating())
+ return;
- pane = hint;
- m_action = actionDragToolbarPane;
- m_action_window = pane.window;
+ pane = hint;
+ m_action = actionDragToolbarPane;
+ m_action_window = pane.window;
- Update();
- }
+ Update();
return;
}
// if a key modifier is pressed while dragging the frame,
// don't dock the window
- if (wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT))
+ if (!CanDockPanel(pane))
{
HideHint();
return;
pt.y = pos.y;
// and some more pixels for the title bar
pt.y -= 10;
- } else
- if (dir == wxWEST)
+ }
+ else if (dir == wxWEST)
{
// move to pane's left border
wxPoint pos( 0,0 );
pos = wnd->ClientToScreen( pos );
pt.x = pos.x;
- } else
- if (dir == wxEAST)
+ }
+ else if (dir == wxEAST)
{
// move to pane's right border
wxPoint pos( wnd->GetSize().x, 0 );
pos = wnd->ClientToScreen( pos );
pt.x = pos.x;
- } else
- if (dir == wxSOUTH)
+ }
+ else if (dir == wxSOUTH)
{
// move to pane's bottom border
wxPoint pos( 0, wnd->GetSize().y );
// if a key modifier is pressed while dragging the frame,
// don't dock the window
- if (!wxGetKeyState(WXK_CONTROL) && !wxGetKeyState(WXK_ALT))
+ if (CanDockPanel(pane))
{
// do the drop calculation
DoDrop(m_docks, m_panes, pane, client_pt, action_offset);
{
pane.floating_pos = pane.frame->GetPosition();
-#if wxCHECK_VERSION(2,7,0)
if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
pane.frame->SetTransparent(255);
-#endif
- } else if(m_has_maximized) {
+ }
+ else if (m_has_maximized)
+ {
RestoreMaximizedPane();
}
// fire pane close event
- wxAuiManagerEvent e(wxEVT_AUI_PANECLOSE);
+ wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE);
e.SetPane(&pane);
e.SetCanVeto(evt.CanVeto());
ProcessMgrEvent(e);
evt.Veto();
return;
}
- else
+ else
{
ClosePane(pane);
}
void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd)
{
- if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
+ if ((GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) && GetPane(wnd).IsOk())
{
- // try to find the pane
- wxASSERT_MSG(GetPane(wnd).IsOk(), wxT("Pane window not found"));
-
SetActivePane(m_panes, wnd);
Repaint();
}
void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
{
+ // if the frame is about to be deleted, don't bother
+ if (!m_frame || wxPendingDelete.Member(m_frame))
+ return;
+
wxDC* dc = evt.GetDC();
#ifdef __WXMAC__
{
wxAuiDockUIPart& part = m_uiparts.Item(i);
- // don't draw hidden pane items
- if (part.sizer_item && !part.sizer_item->IsShown())
+ // don't draw hidden pane items or items that aren't windows
+ if (part.sizer_item && ((!part.sizer_item->IsWindow() && !part.sizer_item->IsSpacer() && !part.sizer_item->IsSizer()) || !part.sizer_item->IsShown()))
continue;
switch (part.type)
void wxAuiManager::Render(wxDC* dc)
{
wxAuiManagerEvent e(wxEVT_AUI_RENDER);
+ e.SetManager(this);
e.SetDC(dc);
ProcessMgrEvent(e);
}
{
DoFrameLayout();
Repaint();
-
+
#if wxUSE_MDI
if (m_frame->IsKindOf(CLASSINFO(wxMDIParentFrame)))
{
event.Skip();
}
+void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt)
+{
+ // get the window we are managing, if none, return NULL
+ wxWindow* window = GetManagedWindow();
+ if (!window)
+ {
+ evt.SetManager(NULL);
+ return;
+ }
+
+ // if we are managing a child frame, get the 'real' manager
+ if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
+ {
+ wxAuiFloatingFrame* float_frame = static_cast<wxAuiFloatingFrame*>(window);
+ evt.SetManager(float_frame->GetOwnerManager());
+ return;
+ }
+
+ // return pointer to ourself
+ evt.SetManager(this);
+}
void wxAuiManager::OnSetCursor(wxSetCursorEvent& event)
{
if (part->orientation == wxVERTICAL)
cursor = wxCursor(wxCURSOR_SIZEWE);
- else
+ else
cursor = wxCursor(wxCURSOR_SIZENS);
}
- else if (part->type == wxAuiDockUIPart::typeGripper)
+ else if (part->type == wxAuiDockUIPart::typeGripper)
{
cursor = wxCursor(wxCURSOR_SIZING);
}
void wxAuiManager::UpdateButtonOnScreen(wxAuiDockUIPart* button_ui_part,
- const wxMouseEvent& event)
+ const wxMouseEvent& event)
{
wxAuiDockUIPart* hit_test = HitTest(event.GetX(), event.GetY());
+ if (!hit_test || !button_ui_part)
+ return;
int state = wxAUI_BUTTON_STATE_NORMAL;
{
if (event.LeftDown())
state = wxAUI_BUTTON_STATE_PRESSED;
- else
+ else
state = wxAUI_BUTTON_STATE_HOVER;
}
- else
+ else
{
if (event.LeftDown())
state = wxAUI_BUTTON_STATE_HOVER;
{
if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
return;
-
+
// a dock may not be resized if it has a single
// pane which is not resizable
if (part->type == wxAuiDockUIPart::typeDockSizer && part->dock &&
event.m_y - part->rect.y);
m_frame->CaptureMouse();
}
- else if (part->type == wxAuiDockUIPart::typePaneButton)
+ else if (part->type == wxAuiDockUIPart::typePaneButton)
{
m_action = actionClickButton;
m_action_part = part;
UpdateButtonOnScreen(part, event);
}
- else if (part->type == wxAuiDockUIPart::typeCaption ||
+ else if (part->type == wxAuiDockUIPart::typeCaption ||
part->type == wxAuiDockUIPart::typeGripper)
{
- if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
+ // if we are managing a wxAuiFloatingFrame window, then
+ // we are an embedded wxAuiManager inside the wxAuiFloatingFrame.
+ // We want to initiate a toolbar drag in our owner manager
+ wxWindow* managed_wnd = GetManagedWindow();
+
+ if (part->pane &&
+ part->pane->window &&
+ managed_wnd &&
+ managed_wnd->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
+ {
+ wxAuiFloatingFrame* floating_frame = (wxAuiFloatingFrame*)managed_wnd;
+ wxAuiManager* owner_mgr = floating_frame->GetOwnerManager();
+ owner_mgr->StartPaneDrag(part->pane->window,
+ wxPoint(event.m_x - part->rect.x,
+ event.m_y - part->rect.y));
return;
+ }
+
+
if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
{
Repaint();
}
+ if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
+ return;
+
m_action = actionClickCaption;
m_action_part = part;
m_action_start = wxPoint(event.m_x, event.m_y);
Update();
Repaint(NULL);
}
- else if (m_action_part &&
- m_action_part->type == wxAuiDockUIPart::typePaneSizer)
+ else if (m_action_part &&
+ m_action_part->type == wxAuiDockUIPart::typePaneSizer)
{
wxAuiDockInfo& dock = *m_action_part->dock;
wxAuiPaneInfo& pane = *m_action_part->pane;
int dock_pixels = 0;
int new_pixsize = 0;
- int caption_size = m_art->GetMetric(wxAUI_ART_CAPTION_SIZE);
- int pane_border_size = m_art->GetMetric(wxAUI_ART_PANE_BORDER_SIZE);
- int sash_size = m_art->GetMetric(wxAUI_ART_SASH_SIZE);
+ int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
+ int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
+ int sash_size = m_art->GetMetric(wxAUI_DOCKART_SASH_SIZE);
wxPoint new_pos(event.m_x - m_action_offset.x,
event.m_y - m_action_offset.y);
// this will help us recalculate the pane's proportion
if (dock.IsHorizontal())
new_pixsize = new_pos.x - pane_part->rect.x;
- else
+ else
new_pixsize = new_pos.y - pane_part->rect.y;
// determine the size of the dock, based on orientation
if (dock.IsHorizontal())
dock_pixels = dock.rect.GetWidth();
- else
+ else
dock_pixels = dock.rect.GetHeight();
// determine the total proportion of all resizable panes,
{
if (dock.IsHorizontal())
dock_pixels -= p.best_size.x;
- else
+ else
dock_pixels -= p.best_size.y;
}
- else
+ else
{
total_proportion += p.dock_proportion;
}
if (pane.HasCaption())
min_size += caption_size;
}
- else
+ else
{
min_size += pane.min_size.x;
}
if (m_action_part == HitTest(event.GetX(), event.GetY()))
{
// fire button-click event
- wxAuiManagerEvent e(wxEVT_AUI_PANEBUTTON);
+ wxAuiManagerEvent e(wxEVT_AUI_PANE_BUTTON);
+ e.SetManager(this);
e.SetPane(m_action_part->pane);
e.SetButton(m_action_part->button->button_id);
ProcessMgrEvent(e);
wxPoint pos = m_action_part->rect.GetPosition();
if (m_action_part->orientation == wxHORIZONTAL)
pos.y = wxMax(0, event.m_y - m_action_offset.y);
- else
+ else
pos.x = wxMax(0, event.m_x - m_action_offset.x);
wxRect rect(m_frame->ClientToScreen(pos),
pt.y - m_action_offset.y);
// float the window
- if(pane_info->IsMaximized()) {
+ if (pane_info->IsMaximized())
RestorePane(*pane_info);
- }
pane_info->Float();
Update();
m_action_offset.x = 30;
}
}
- else
+ else
{
m_action = actionDragToolbarPane;
m_action_window = pane_info->window;
}
else if (m_action == actionDragFloatingPane)
{
- if(m_action_window) {
+ if (m_action_window)
+ {
wxPoint pt = m_frame->ClientToScreen(event.GetPosition());
m_action_window->Move(pt.x - m_action_offset.x,
pt.y - m_action_offset.y);
UpdateButtonOnScreen(m_hover_button, event);
Repaint();
}
-
+
// mouse is over a button, so repaint the
// button in hover mode
UpdateButtonOnScreen(part, event);
m_hover_button = part;
-
+
}
}
- else
+ else
{
if (m_hover_button)
{
m_hover_button = NULL;
Repaint();
}
- else
+ else
{
event.Skip();
}
if (evt.button == wxAUI_BUTTON_CLOSE)
{
// fire pane close event
- wxAuiManagerEvent e(wxEVT_AUI_PANECLOSE);
+ wxAuiManagerEvent e(wxEVT_AUI_PANE_CLOSE);
+ e.SetManager(this);
e.SetPane(evt.pane);
ProcessMgrEvent(e);
else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && !pane.IsMaximized())
{
// fire pane close event
- wxAuiManagerEvent e(wxEVT_AUI_PANEMAXIMIZE);
+ wxAuiManagerEvent e(wxEVT_AUI_PANE_MAXIMIZE);
+ e.SetManager(this);
e.SetPane(evt.pane);
ProcessMgrEvent(e);
else if (evt.button == wxAUI_BUTTON_MAXIMIZE_RESTORE && pane.IsMaximized())
{
// fire pane close event
- wxAuiManagerEvent e(wxEVT_AUI_PANERESTORE);
+ wxAuiManagerEvent e(wxEVT_AUI_PANE_RESTORE);
+ e.SetManager(this);
e.SetPane(evt.pane);
ProcessMgrEvent(e);
Update();
}
}
- else if (evt.button == wxAUI_BUTTON_PIN)
+ else if (evt.button == wxAUI_BUTTON_PIN)
{
if ((m_flags & wxAUI_MGR_ALLOW_FLOATING) &&
pane.IsFloatable())
projects / wxWidgets.git / blobdiff