#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"
// a few defines to avoid nameclashes
#define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1
#define __AIFF__
- #include "wx/mac/private.h"
+ #include "wx/osx/private.h"
+#endif
+
+#ifdef __WXMSW__
+ #include "wx/msw/wrapwin.h"
+ #include "wx/msw/private.h"
+ #include "wx/msw/dc.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxAuiManagerEvent, wxEvent)
const int auiToolBarLayer = 10;
+#ifndef __WXGTK20__
+
class wxPseudoTransparentFrame : public wxFrame
{
wxRect rect(upd.GetRect());
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
- upd++;
+ ++upd;
}
}
END_EVENT_TABLE()
+#else
+ // __WXGTK20__
+
+#include <gtk/gtk.h>
+
+static void
+gtk_pseudo_window_realized_callback( GtkWidget *m_widget, void *WXUNUSED(win) )
+{
+ wxSize disp = wxGetDisplaySize();
+ int amount = 128;
+ wxRegion region;
+ for (int y=0; y<disp.y; y++)
+ {
+ // Reverse the order of the bottom 4 bits
+ int j=((y&8)?1:0)|((y&4)?2:0)|((y&2)?4:0)|((y&1)?8:0);
+ if ((j*16+8)<amount)
+ region.Union(0, y, disp.x, 1);
+ }
+ gdk_window_shape_combine_region(m_widget->window, region.GetRegion(), 0, 0);
+}
+
+
+class wxPseudoTransparentFrame: public wxFrame
+{
+public:
+ wxPseudoTransparentFrame(wxWindow* parent = NULL,
+ wxWindowID id = wxID_ANY,
+ const wxString& title = wxEmptyString,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxDEFAULT_FRAME_STYLE,
+ const wxString &name = wxT("frame"))
+ {
+ if (!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ return;
+
+ m_title = title;
+
+ m_widget = gtk_window_new( GTK_WINDOW_POPUP );
+
+ g_signal_connect( m_widget, "realize",
+ G_CALLBACK (gtk_pseudo_window_realized_callback), this );
+
+ GdkColor col;
+ col.red = 128 * 256;
+ col.green = 192 * 256;
+ col.blue = 255 * 256;
+ gtk_widget_modify_bg( m_widget, GTK_STATE_NORMAL, &col );
+ }
+
+ bool SetTransparent(wxByte WXUNUSED(alpha))
+ {
+ return true;
+ }
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxPseudoTransparentFrame)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPseudoTransparentFrame, wxFrame)
+
+#endif
+ // __WXGTK20__
+
+
+
// -- static utility functions --
static wxBitmap wxPaneCreateStippleBitmap()
wxBitmap stipple = wxPaneCreateStippleBitmap();
wxBrush brush(stipple);
dc.SetBrush(brush);
+#ifdef __WXMSW__
+ wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
+ PatBlt(GetHdcOf(*impl), rect.GetX(), rect.GetY(), rect.GetWidth(), rect.GetHeight(), PATINVERT);
+#else
dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetLogicalFunction(wxXOR);
dc.DrawRectangle(rect);
+#endif
}
}
}
+/*
+// This function works fine, and may be used in the future
+
// RenumberDockRows() takes a dock and assigns sequential numbers
// to existing rows. Basically it takes out the gaps; so if a
// dock has rows with numbers 0,2,5, they will become 0,1,2
static void RenumberDockRows(wxAuiDockInfoPtrArray& docks)
{
- int i, dock_count, j, pane_count;
+ int i, dock_count;
for (i = 0, dock_count = docks.GetCount(); i < dock_count; ++i)
{
wxAuiDockInfo& dock = *docks.Item(i);
dock.dock_row = i;
+
+ int j, pane_count;
for (j = 0, pane_count = dock.panes.GetCount(); j < pane_count; ++j)
dock.panes.Item(j)->dock_row = i;
}
}
+*/
// SetActivePane() sets the active pane, as well as cycles through
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()
{
+ // NOTE: It's possible that the windows have already been destroyed by the
+ // time this dtor is called, so this loop can result in memory access via
+ // invalid pointers, resulting in a crash. So it will be disabled while
+ // waiting for a better solution.
+#if 0
+ for ( size_t i = 0; i < m_panes.size(); i++ )
+ {
+ wxAuiPaneInfo& pinfo = m_panes[i];
+ if (pinfo.window && !pinfo.window->GetParent())
+ delete pinfo.window;
+ }
+#endif
+
delete m_art;
}
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
// on the supplied window pointer. Upon failure, GetPane()
// returns an empty wxAuiPaneInfo, a condition which can be checked
// set the new flags
m_flags = flags;
-
+
if (update_hint_wnd)
{
UpdateHintWindowConfig();
evt.ResumePropagation(wxEVENT_PROPAGATE_MAX);
if (!window->ProcessEvent(evt))
return NULL;
-
+
return evt.GetManager();
}
{
// find out if the the system can do transparent frames
bool can_do_transparent = false;
-
+
wxWindow* w = m_frame;
while (w)
{
{
wxFrame* f = static_cast<wxFrame*>(w);
can_do_transparent = f->CanSetTransparent();
+
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 (pinfo.name.empty() || already_exists)
{
pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"),
- ((unsigned long)pinfo.window) & 0xffffffff,
+ wxPtrToUInt(pinfo.window) & 0xffffffff,
(unsigned int)time(NULL),
#ifdef __WXWINCE__
(unsigned int)GetTickCount(),
button.button_id = wxAUI_BUTTON_MAXIMIZE_RESTORE;
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();
{
m_action_window = NULL;
}
-
+
p.window->Reparent(m_frame);
p.frame->SetSizer(NULL);
p.frame->Destroy();
return false;
}
-// ClosePane() destroys or hides the pane depending on its
-// flags
+// ClosePane() destroys or hides the pane depending on its flags
void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)
{
// if we were maximized, restore
}
// 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);
{
window->Destroy();
}
- }
- else
+ }
+ else
{
pane_info.Hide();
}
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();
}
}
wxAuiPaneInfo& p = m_panes.Item(i);
if (!p.IsToolbar())
{
- p.RestoreHidden();
+ p.SetFlag(wxAuiPaneInfo::optionHidden,
+ p.HasFlag(wxAuiPaneInfo::savedHiddenState));
}
}
{
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
if (!p.IsOk())
{
// the pane window couldn't be found
- // in the existing layout
- return false;
+ // in the existing layout -- skip it
+ continue;
}
p.SafeSet(pane);
-
}
if (update)
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 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;
part.sizer_item = sizer_item;
uiparts.Add(part);
}
- else
+ else
{
sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND);
}
{
wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));
int pane_pos = pane_positions.Item(pane_i);
-
+
if (pane.IsMaximized())
has_maximized_pane = true;
{
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;
for (pane_i = 0; pane_i < pane_count; ++pane_i)
{
wxAuiPaneInfo& pane = *(dock.panes.Item(pane_i));
-
+
if (pane.IsMaximized())
has_maximized_pane = true;
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
}
wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
- wxAuiDockInfoArray& docks,
- wxAuiDockUIPartArray& uiparts,
- bool spacer_only)
+ wxAuiDockInfoArray& docks,
+ wxAuiDockUIPartArray& uiparts,
+ bool spacer_only)
{
wxBoxSizer* container = new wxBoxSizer(wxVERTICAL);
// 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
// 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 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, max_dock_y_size);
- else
+ 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;
dock.fixed = false;
if (!pane.IsToolbar())
dock.toolbar = false;
+ if (pane.HasFlag(wxAuiPaneInfo::optionDockFixed))
+ dock.fixed = true;
if (pane.state & wxAuiPaneInfo::actionPane)
action_pane_marked = true;
}
int amount = pane.dock_pos - offset;
if (amount >= 0)
offset += amount;
- else
+ else
pane.dock_pos += -amount;
offset += pane_sizes[j];
// find any top docks in this layer
FindDocks(docks, wxAUI_DOCK_TOP, layer, -1, arr);
- RenumberDockRows(arr);
if (!arr.IsEmpty())
{
for (row = 0, row_count = arr.GetCount(); row < row_count; ++row)
// find any left docks in this layer
FindDocks(docks, wxAUI_DOCK_LEFT, layer, -1, arr);
- RenumberDockRows(arr);
if (!arr.IsEmpty())
{
for (row = 0, row_count = arr.GetCount(); row < row_count; ++row)
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);
}
// find any right docks in this layer
FindDocks(docks, wxAUI_DOCK_RIGHT, layer, -1, arr);
- RenumberDockRows(arr);
if (!arr.IsEmpty())
{
for (row = arr.GetCount()-1; row >= 0; --row)
LayoutAddDock(middle, *arr.Item(row), uiparts, spacer_only);
}
- cont->Add(middle, 1, wxEXPAND);
-
+ if (middle->GetChildren().GetCount() > 0)
+ cont->Add(middle, 1, wxEXPAND);
+ else
+ delete middle;
+
// find any bottom docks in this layer
FindDocks(docks, wxAUI_DOCK_BOTTOM, layer, -1, arr);
- RenumberDockRows(arr);
if (!arr.IsEmpty())
{
for (row = arr.GetCount()-1; row >= 0; --row)
{
if (width_pct)
*width_pct = m_dock_constraint_x;
-
+
if (height_pct)
*height_pct = m_dock_constraint_y;
}
void wxAuiManager::Update()
{
+ m_hover_button = NULL;
+
wxSizer* sizer;
int i, pane_count = m_panes.GetCount();
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);
{
m_action_window = NULL;
}
-
+
p.window->Reparent(m_frame);
p.frame->SetSizer(NULL);
p.frame->Destroy();
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,
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)
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).
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).
{
int new_layer = wxMax(wxMax(GetMaxLayer(docks, wxAUI_DOCK_RIGHT),
GetMaxLayer(docks, wxAUI_DOCK_TOP)),
- GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1;
-
+ GetMaxLayer(docks, wxAUI_DOCK_BOTTOM)) + 1;
+
if (drop.IsToolbar())
new_layer = auiToolBarLayer;
-
+
drop.Dock().Right().
Layer(new_layer).
Row(0).
int new_layer = wxMax( wxMax( GetMaxLayer(docks, wxAUI_DOCK_BOTTOM),
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).
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_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();
- m_hint_wnd->SetTransparent(m_hint_fadeamt);
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
// nasty redrawn problems.
clip.Intersect(m_frame->GetRect());
- screendc.SetClippingRegion(clip);
+ screendc.SetDeviceClippingRegion(clip);
wxBitmap stipple = wxPaneCreateStippleBitmap();
wxBrush brush(stipple);
wxAuiPaneInfo& pane = GetPane(pane_window);
if (!pane.IsOk())
return;
-
+
if (pane.IsToolbar())
{
m_action = actionDragToolbarPane;
}
- else
+ else
{
m_action = actionDragFloatingPane;
}
-
+
m_action_window = pane_window;
m_action_offset = offset;
m_frame->CaptureMouse();
wxAuiDockUIPartArray uiparts;
wxAuiPaneInfo hint = GetPane(pane_window);
hint.name = wxT("__HINT__");
+ hint.PaneBorder(true);
hint.Show();
if (!hint.IsOk())
// actually show the hint rectangle on the screen
m_frame->ClientToScreen(&rect.x, &rect.y);
+ if ( m_frame->GetLayoutDirection() == wxLayout_RightToLeft )
+ {
+ // Mirror rectangle in RTL mode
+ rect.x -= rect.GetWidth();
+ }
+
return rect;
}
const wxPoint& offset)
{
wxRect rect = CalculateHintRect(pane_window, pt, offset);
-
+
if (rect.IsEmpty())
{
HideHint();
}
- else
+ else
{
ShowHint(rect);
}
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);
if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
pane.frame->SetTransparent(255);
}
- else if (m_has_maximized)
+ else if (m_has_maximized)
{
RestoreMaximizedPane();
}
evt.Veto();
return;
}
- else
+ else
{
- ClosePane(pane);
+ // close the pane, but check that it
+ // still exists in our pane array first
+ // (the event handler above might have removed it)
+
+ wxAuiPaneInfo& check = GetPane(wnd);
+ if (check.IsOk())
+ {
+ 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)
{
DoFrameLayout();
Repaint();
-
+
#if wxUSE_MDI
if (m_frame->IsKindOf(CLASSINFO(wxMDIParentFrame)))
{
evt.SetManager(NULL);
return;
}
-
+
// if we are managing a child frame, get the 'real' manager
if (window->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
{
evt.SetManager(float_frame->GetOwnerManager());
return;
}
-
+
// return pointer to ourself
evt.SetManager(this);
}
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);
}
wxAuiDockUIPart* hit_test = HitTest(event.GetX(), event.GetY());
if (!hit_test || !button_ui_part)
return;
-
+
int state = wxAUI_BUTTON_STATE_NORMAL;
if (hit_test == button_ui_part)
{
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->type == wxAuiDockUIPart::typeDockSizer ||
part->type == wxAuiDockUIPart::typePaneSizer)
{
- if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
- return;
-
+ // Removing this restriction so that a centre pane can be resized
+ //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 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 &&
+
+ if (part->pane &&
part->pane->window &&
managed_wnd &&
managed_wnd->IsKindOf(CLASSINFO(wxAuiFloatingFrame)))
event.m_y - part->rect.y));
return;
}
-
-
-
- if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
- 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;
// 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;
}
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),
m_action_offset.x = 30;
}
}
- else
+ else
{
m_action = actionDragToolbarPane;
m_action_window = pane_info->window;
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();
}
// active panes are allowed by the owner)
if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
{
- if (GetPane(event.GetWindow()).IsOk())
+ wxAuiPaneInfo& pane = GetPane(event.GetWindow());
+ if (pane.IsOk() && (pane.state & wxAuiPaneInfo::optionActive) == 0)
{
SetActivePane(m_panes, event.GetWindow());
m_frame->Refresh();
if (!e.GetVeto())
{
- ClosePane(pane);
+ // close the pane, but check that it
+ // still exists in our pane array first
+ // (the event handler above might have removed it)
+
+ wxAuiPaneInfo& check = GetPane(pane.window);
+ if (check.IsOk())
+ {
+ ClosePane(pane);
+ }
+
Update();
}
}
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