return true;
}
+protected:
+ virtual void DoSetSizeHints( int minW, int minH,
+ int maxW, int maxH,
+ int incW, int incH)
+ {
+ // the real wxFrame method doesn't work for us because we're not really
+ // a top level window so skip it
+ wxWindow::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);
+ }
+
private:
DECLARE_DYNAMIC_CLASS(wxPseudoTransparentFrame)
};
}
-
-
-// this utility class implements a proportional sizer
-// as it existed in wxWidgets 2.8 and before.
-
-class wxAuiProportionalBoxSizer : public wxBoxSizer
+bool wxAuiPaneInfo::IsValid() const
{
-public:
- wxAuiProportionalBoxSizer(int orientation) : wxBoxSizer(orientation) { }
-
- void RecalcSizes()
- {
- if (m_children.GetCount() == 0)
- return;
-
- int fixed_height = 0;
- int fixed_width = 0;
- int stretchable = 0;
- wxSizerItemList::compatibility_iterator node;
-
- // find fixed width and height, as well
- // as the total stretchable proportions
- node = m_children.GetFirst();
- while (node)
- {
- wxSizerItem *item = node->GetData();
-
- if (item->IsShown())
- {
- stretchable += item->GetProportion();
-
- wxSize size(item->GetMinSizeWithBorder());
- if (item->GetProportion() == 0)
- {
- if (m_orient == wxVERTICAL)
- {
- fixed_height += size.y;
- fixed_width = wxMax(fixed_width, size.x);
- }
- else
- {
- fixed_width += size.x;
- fixed_height = wxMax(fixed_height, size.y);
- }
- }
- }
-
- node = node->GetNext();
- }
-
-
- // delta specifies the total amount to be allocated to stretch spaces
- int delta = 0;
- if (stretchable)
- {
- if (m_orient == wxHORIZONTAL)
- delta = m_size.x - fixed_width;
- else
- delta = m_size.y - fixed_height;
- }
-
- // go through each item and assign sizes
- wxPoint pt(m_position);
- node = m_children.GetFirst();
- while (node)
- {
- wxSizerItem* item = node->GetData();
-
- if (item->IsShown())
- {
- wxSize size(item->GetMinSizeWithBorder());
-
- if (m_orient == wxVERTICAL)
- {
- wxCoord height = size.y;
- if (item->GetProportion())
- {
- height = (delta * item->GetProportion()) / stretchable;
- delta -= height;
- stretchable -= item->GetProportion();
- }
-
- wxPoint child_pos(pt);
- wxSize child_size(size.x, height);
-
- if (item->GetFlag() & (wxEXPAND | wxSHAPED))
- child_size.x = m_size.x;
- else if (item->GetFlag() & wxALIGN_RIGHT)
- child_pos.x += m_size.x - size.x;
- else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL))
- child_pos.x += (m_size.x - size.x) / 2;
-
- item->SetDimension(child_pos, child_size);
-
- pt.y += height;
- }
- else
- {
- wxCoord width = size.x;
- if (item->GetProportion())
- {
- width = (delta * item->GetProportion()) / stretchable;
- delta -= width;
- stretchable -= item->GetProportion();
- }
-
- wxPoint child_pos(pt);
- wxSize child_size(width, size.y);
-
- if (item->GetFlag() & (wxEXPAND | wxSHAPED))
- child_size.y = m_size.y;
- else if (item->GetFlag() & wxALIGN_BOTTOM)
- child_pos.y += m_size.y - size.y;
- else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL))
- child_pos.y += (m_size.y - size.y) / 2;
-
- item->SetDimension(child_pos, child_size);
-
- pt.x += width;
- }
- }
-
- node = node->GetNext();
- }
- }
-};
-
-
-
+ // Should this RTTI and function call be rewritten as
+ // sending a new event type to allow other window types
+ // to check the pane settings?
+ wxAuiToolBar* toolbar = wxDynamicCast(window, wxAuiToolBar);
+ return !toolbar || toolbar->IsPaneValid(*this);
+}
// -- wxAuiManager class implementation --
EVT_MOUSE_CAPTURE_LOST(wxAuiManager::OnCaptureLost)
EVT_CHILD_FOCUS(wxAuiManager::OnChildFocus)
EVT_AUI_FIND_MANAGER(wxAuiManager::OnFindManager)
- EVT_TIMER(101, wxAuiManager::OnHintFadeTimer)
END_EVENT_TABLE()
if (pane_info.IsDocked())
RestoreMaximizedPane();
- m_panes.Add(pane_info);
+ // special case: wxAuiToolBar style interacts with docking flags
+ wxAuiPaneInfo test(pane_info);
+ wxAuiToolBar* toolbar = wxDynamicCast(window, wxAuiToolBar);
+ if (toolbar)
+ {
+ // if pane has default docking flags
+ const unsigned int dockMask = wxAuiPaneInfo::optionLeftDockable |
+ wxAuiPaneInfo::optionRightDockable |
+ wxAuiPaneInfo::optionTopDockable |
+ wxAuiPaneInfo::optionBottomDockable;
+ const unsigned int defaultDock = wxAuiPaneInfo().
+ DefaultPane().state & dockMask;
+ if ((test.state & dockMask) == defaultDock)
+ {
+ // set docking flags based on toolbar style
+ if (toolbar->GetWindowStyleFlag() & wxAUI_TB_VERTICAL)
+ {
+ test.TopDockable(false).BottomDockable(false);
+ }
+ else if (toolbar->GetWindowStyleFlag() & wxAUI_TB_HORIZONTAL)
+ {
+ test.LeftDockable(false).RightDockable(false);
+ }
+ }
+ else
+ {
+ // see whether non-default docking flags are valid
+ test.window = window;
+ wxCHECK_MSG(test.IsValid(), false,
+ "toolbar style and pane docking flags are incompatible");
+ }
+ }
+
+ m_panes.Add(test);
wxAuiPaneInfo& pinfo = m_panes.Last();
if (pinfo.name.empty() || already_exists)
{
pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"),
- wxPtrToUInt(pinfo.window) & 0xffffffff,
+ (unsigned long)(wxPtrToUInt(pinfo.window) & 0xffffffff),
(unsigned int)time(NULL),
#ifdef __WXWINCE__
(unsigned int)GetTickCount(),
// a toolbar under some newer versions of wxWidgets,
// so use GetBestSize()
pinfo.best_size = pinfo.window->GetBestSize();
-
- // for some reason, wxToolBar::GetBestSize() is returning
- // a size that is a pixel shy of the correct amount.
- // I believe this to be the correct action, until
- // wxToolBar::GetBestSize() is fixed. Is this assumption
- // correct?
- // commented out by JACS 2007-9-08 after having added a pixel in wxMSW's wxToolBar::DoGetBestSize()
- // pinfo.best_size.y++;
}
#endif // wxUSE_TOOLBAR
if (part != wxT("layout2"))
return false;
- // mark all panes currently managed as docked and hidden
+ // Mark all panes currently managed as hidden. Also, dock all panes that are dockable.
int pane_i, pane_count = m_panes.GetCount();
for (pane_i = 0; pane_i < pane_count; ++pane_i)
- m_panes.Item(pane_i).Dock().Hide();
+ {
+ wxAuiPaneInfo& p = m_panes.Item(pane_i);
+ if(p.IsDockable())
+ p.Dock();
+ p.Hide();
+ }
// clear out the dock array; this will be reconstructed
m_docks.Clear();
// value that the pane will receive
int pane_proportion = pane.dock_proportion;
- wxAuiProportionalBoxSizer* horz_pane_sizer = new wxAuiProportionalBoxSizer(wxHORIZONTAL);
- wxAuiProportionalBoxSizer* vert_pane_sizer = new wxAuiProportionalBoxSizer(wxVERTICAL);
+ wxBoxSizer* horz_pane_sizer = new wxBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* vert_pane_sizer = new wxBoxSizer(wxVERTICAL);
if (pane.HasGripper())
{
if (pane.HasCaption())
{
// create the caption sizer
- wxAuiProportionalBoxSizer* caption_sizer = new wxAuiProportionalBoxSizer(wxHORIZONTAL);
+ wxBoxSizer* caption_sizer = new wxBoxSizer(wxHORIZONTAL);
sizer_item = caption_sizer->Add(1, caption_size, 1, wxEXPAND);
}
// create the sizer for the dock
- wxSizer* dock_sizer = new wxAuiProportionalBoxSizer(orientation);
+ wxSizer* dock_sizer = new wxBoxSizer(orientation);
// add each pane to the dock
bool has_maximized_pane = false;
wxAuiDockUIPartArray& uiparts,
bool spacer_only)
{
- wxAuiProportionalBoxSizer* container = new wxAuiProportionalBoxSizer(wxVERTICAL);
+ wxBoxSizer* container = new wxBoxSizer(wxVERTICAL);
int pane_border_size = m_art->GetMetric(wxAUI_DOCKART_PANE_BORDER_SIZE);
int caption_size = m_art->GetMetric(wxAUI_DOCKART_CAPTION_SIZE);
// create a container which will hold this layer's
// docks (top, bottom, left, right)
- cont = new wxAuiProportionalBoxSizer(wxVERTICAL);
+ cont = new wxBoxSizer(wxVERTICAL);
// find any top docks in this layer
// fill out the middle layer (which consists
// of left docks, content area and right docks)
- middle = new wxAuiProportionalBoxSizer(wxHORIZONTAL);
+ middle = new wxBoxSizer(wxHORIZONTAL);
// find any left docks in this layer
FindDocks(docks, wxAUI_DOCK_LEFT, layer, -1, arr);
{
// no sizer available, because there are no docks,
// therefore we will create a simple background area
- cont = new wxAuiProportionalBoxSizer(wxVERTICAL);
+ cont = new wxBoxSizer(wxVERTICAL);
wxSizerItem* sizer_item = cont->Add(1,1, 1, wxEXPAND);
wxAuiDockUIPart part;
part.type = wxAuiDockUIPart::typeBackground;
*/
}
+ // update whether the pane is resizable or not
+ long style = p.frame->GetWindowStyleFlag();
+ if (p.IsFixed())
+ style &= ~wxRESIZE_BORDER;
+ else
+ style |= wxRESIZE_BORDER;
+ p.frame->SetWindowStyleFlag(style);
+
+ if (p.frame->GetLabel() != p.caption)
+ p.frame->SetLabel(p.caption);
+
if (p.frame->IsShown() != p.IsShown())
p.frame->Show(p.IsShown());
}
}
if (allowed)
+ {
target = new_pos;
+ // Should this RTTI and function call be rewritten as
+ // sending a new event type to allow other window types
+ // to vary size based on dock location?
+ wxAuiToolBar* toolbar = wxDynamicCast(target.window, wxAuiToolBar);
+ if (toolbar)
+ {
+ wxSize hintSize = toolbar->GetHintSize(target.dock_direction);
+ if (target.best_size != hintSize)
+ {
+ target.best_size = hintSize;
+ target.floating_size = wxDefaultSize;
+ }
+ }
+ }
return allowed;
}
if (!m_hint_wnd || m_hint_fadeamt >= m_hint_fademax)
{
m_hint_fadetimer.Stop();
+ Disconnect(m_hint_fadetimer.GetId(), wxEVT_TIMER,
+ wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
return;
}
if (m_hint_fadeamt != m_hint_fademax) // Only fade if we need to
{
// start fade in timer
- m_hint_fadetimer.SetOwner(this, 101);
+ m_hint_fadetimer.SetOwner(this);
m_hint_fadetimer.Start(5);
+ Connect(m_hint_fadetimer.GetId(), wxEVT_TIMER,
+ wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
}
}
else // Not using a transparent hint window...
m_hint_wnd->Show(false);
m_hint_wnd->SetTransparent(0);
m_hint_fadetimer.Stop();
+ // In case this is called while a hint fade is going, we need to
+ // disconnect the event handler.
+ Disconnect(m_hint_fadetimer.GetId(), wxEVT_TIMER,
+ wxTimerEventHandler(wxAuiManager::OnHintFadeTimer));
m_last_hint = wxRect();
return;
}
wxAuiPaneInfo& pane = GetPane(wnd);
wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
+ if(!pane.frame)
+ return;
+
if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
pane.frame->SetTransparent(150);
}
HideHint();
}
-void wxAuiManager::OnFloatingPaneResized(wxWindow* wnd, const wxSize& size)
+void wxAuiManager::OnFloatingPaneResized(wxWindow* wnd, const wxRect& rect)
{
// try to find the pane
wxAuiPaneInfo& pane = GetPane(wnd);
wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
- pane.floating_size = size;
+ pane.FloatingSize(rect.GetWidth(), rect.GetHeight());
+
+ // the top-left position may change as well as the size
+ pane.FloatingPosition(rect.x, rect.y);
}
int used_width = 0, used_height = 0;
wxSize client_size = m_frame->GetClientSize();
-
+
size_t dock_i, dock_count = m_docks.GetCount();
for (dock_i = 0; dock_i < dock_count; ++dock_i)
{
if (dock.resizable)
used_width += sash_size;
}
-
-
+
+
int available_width = client_size.GetWidth() - used_width;
int available_height = client_size.GetHeight() - used_height;
-
-
+
+
#if wxUSE_STATUSBAR
// if there's a status control, the available
// height decreases accordingly
}
}
#endif
-
+
wxRect& rect = m_action_part->dock->rect;
wxPoint new_pos(event.m_x - m_action_offset.x,
event.m_y - m_action_offset.y);
int new_size, old_size = m_action_part->dock->size;
-
+
switch (m_action_part->dock->dock_direction)
{
case wxAUI_DOCK_LEFT:
m_action = actionNone;
return false;
}
-
+
// calculate the new proportion of the pane
int new_proportion = (new_pixsize*total_proportion)/dock_pixels;
prop_borrow -= prop_diff;
}
-
+
dock.panes.Item(borrow_pane)->dock_proportion = prop_borrow;
pane.dock_proportion = new_proportion;
DrawResizeHint(dc, m_action_hintrect);
m_action_hintrect = wxRect();
}
-
+
// draw new resize hint, if it's inside the managed frame
wxRect frame_screen_rect = m_frame->GetScreenRect();
if (frame_screen_rect.Contains(rect))
projects / wxWidgets.git / blobdiff