X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ec3100ac1f54ae988d6968a71bfbc6ba7a1e0f2..3201a1046ba71ba8e5ef2ed694fde34d12f743f3:/src/generic/collpaneg.cpp diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp index 4a91de602d..d347294f26 100644 --- a/src/generic/collpaneg.cpp +++ b/src/generic/collpaneg.cpp @@ -16,28 +16,30 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/defs.h" + +#if wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE + +#include "wx/collpane.h" #ifndef WX_PRECOMP + #include "wx/toplevel.h" #include "wx/button.h" #include "wx/sizer.h" + #include "wx/panel.h" #endif // !WX_PRECOMP -#include "wx/collpane.h" #include "wx/statline.h" // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -// the number of pixels to leave between the button and the static line and -// between the button and the pane -#define wxCP_MARGIN 10 - // ============================================================================ // implementation // ============================================================================ -const wxChar wxGenericCollapsiblePaneNameStr[] = wxT("genericCollapsiblePane"); +const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane"); //----------------------------------------------------------------------------- // wxGenericCollapsiblePane @@ -50,8 +52,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl) EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton) EVT_SIZE(wxGenericCollapsiblePane::OnSize) + + WX_EVENT_TABLE_CONTROL_CONTAINER(wxGenericCollapsiblePane) END_EVENT_TABLE() +WX_DELEGATE_TO_CONTROL_CONTAINER(wxGenericCollapsiblePane, wxControl) + +void wxGenericCollapsiblePane::Init() +{ + WX_INIT_CONTROL_CONTAINER(); + + m_pButton = NULL; + m_pPane = NULL; + m_pStaticLine = NULL; + m_sz = NULL; +} bool wxGenericCollapsiblePane::Create(wxWindow *parent, wxWindowID id, @@ -67,40 +82,79 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent, m_strLabel = label; - // create children; their size & position is set in OnSize() +#ifdef __WXMAC__ + // on Mac we use the disclosure triangle + // we need a light gray line above and below, lets approximate with the frame + m_pStaticLine = NULL; + m_pButton = new wxDisclosureTriangle( this, wxID_ANY, GetBtnLabel(), + wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER ); + m_pButton->SetBackgroundColour( wxColour( 221, 226, 239 ) ); + m_sz = new wxBoxSizer(wxHORIZONTAL); + // m_sz->Add(4,4); where shall we put it? + m_sz->Add( m_pButton, 1); +#else + // create children and lay them out using a wxBoxSizer + // (so that we automatically get RTL features) m_pButton = new wxButton(this, wxID_ANY, GetBtnLabel(), wxPoint(0, 0), wxDefaultSize, wxBU_EXACTFIT); - m_pStatLine = new wxStaticLine(this, wxID_ANY); - m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxNO_BORDER); + m_pStaticLine = new wxStaticLine(this, wxID_ANY); + // on other platforms we put the static line and the button horizontally + m_sz = new wxBoxSizer(wxHORIZONTAL); + m_sz->Add(m_pButton, 0, wxLEFT|wxTOP|wxBOTTOM, GetBorder()); + m_sz->Add(m_pStaticLine, 1, wxALIGN_CENTER|wxLEFT|wxRIGHT, GetBorder()); +#endif + + // FIXME: at least under wxCE and wxGTK1 the background is black if we don't do + // this, no idea why... +#if defined(__WXWINCE__) || defined(__WXGTK__) + SetBackgroundColour(parent->GetBackgroundColour()); +#endif + + // do not set sz as our sizers since we handle the pane window without using sizers + m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + wxTAB_TRAVERSAL|wxNO_BORDER); // start as collapsed: m_pPane->Hide(); - //CacheBestSize(GetBestSize()); return true; } -wxSize wxGenericCollapsiblePane::DoGetBestSize() const +wxGenericCollapsiblePane::~wxGenericCollapsiblePane() { - wxSize sz = m_pButton->GetBestSize(); + if (m_pButton) + m_pButton->SetContainingSizer(NULL); + + if (m_pStaticLine) + m_pStaticLine->SetContainingSizer(NULL); + + // our sizer is not deleted automatically since we didn't use SetSizer()! + wxDELETE(m_sz); +} - // set width - sz.SetWidth(sz.x + wxCP_MARGIN + m_pStatLine->GetBestSize().x); - const wxCoord paneWidth = m_pPane->GetBestSize().x; - if ( sz.x < paneWidth ) - sz.x = paneWidth; +wxSize wxGenericCollapsiblePane::DoGetBestSize() const +{ + // NB: do not use GetSize() but rather GetMinSize() + wxSize sz = m_sz->GetMinSize(); // when expanded, we need more vertical space if ( IsExpanded() ) - sz.SetHeight(sz.y + wxCP_MARGIN + m_pPane->GetBestSize().y); + { + sz.SetWidth(wxMax( sz.GetWidth(), m_pPane->GetBestSize().x )); + sz.SetHeight(sz.y + GetBorder() + m_pPane->GetBestSize().y); + } return sz; } wxString wxGenericCollapsiblePane::GetBtnLabel() const { + // on mac the triangle indicates the state, no string change +#ifdef __WXMAC__ + return m_strLabel; +#else return m_strLabel + (IsCollapsed() ? wxT(" >>") : wxT(" <<")); +#endif } void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz) @@ -109,41 +163,28 @@ void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz) SetMinSize(sz); SetSize(sz); - wxWindow *top = wxGetTopLevelParent(this); - if (top) + if (this->HasFlag(wxCP_NO_TLW_RESIZE)) { - // we've changed our size, thus our top level parent needs to relayout - // itself - top->Layout(); - - // FIXME: this makes wxGenericCollapsiblePane behave as the user expect - // but maybe there are cases where this is unwanted! - if (top->GetSizer()) -#ifdef __WXGTK__ - // FIXME: the SetSizeHints() call would be required also for GTK+ for - // the expanded->collapsed transition. Unfortunately if we - // enable this line, then the GTK+ top window won't always be - // resized by the SetClientSize() call below! As a side effect - // of this dirty fix, the minimal size for the pane window is - // not set in GTK+ and the user can hide it shrinking the "top" - // window... - if (IsCollapsed()) -#endif - top->GetSizer()->SetSizeHints(top); - - if (IsCollapsed()) - { - // use SetClientSize() and not SetSize() otherwise the size for - // e.g. a wxFrame with a menubar wouldn't be correctly set - top->SetClientSize(sz); - } - else - { - // force our parent to "fit", i.e. expand so that it can honour - // our minimal size - top->Fit(); - } + // the user asked to explicitely handle the resizing itself... + return; } + + + wxTopLevelWindow *top = + wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( !top ) + return; + + wxSizer *sizer = top->GetSizer(); + if ( !sizer ) + return; + + const wxSize newBestSize = sizer->ComputeFittingClientSize(top); + top->SetMinClientSize(newBestSize); + + // we shouldn't attempt to resize a maximized window, whatever happens + if ( !top->IsMaximized() ) + top->SetClientSize(newBestSize); } void wxGenericCollapsiblePane::Collapse(bool collapse) @@ -156,8 +197,13 @@ void wxGenericCollapsiblePane::Collapse(bool collapse) m_pPane->Show(!collapse); // update button label +#ifdef __WXMAC__ + m_pButton->SetOpen( !collapse ); +#else // NB: this must be done after updating our "state" m_pButton->SetLabel(GetBtnLabel()); +#endif + OnStateChange(GetBestSize()); } @@ -165,26 +211,56 @@ void wxGenericCollapsiblePane::Collapse(bool collapse) void wxGenericCollapsiblePane::SetLabel(const wxString &label) { m_strLabel = label; +#ifdef __WXMAC__ + m_pButton->SetLabel(GetBtnLabel()); +#else m_pButton->SetLabel(GetBtnLabel()); - m_pButton->SetBestFittingSize(); + m_pButton->SetInitialSize(); +#endif - LayoutChildren(); + Layout(); } -void wxGenericCollapsiblePane::LayoutChildren() +bool wxGenericCollapsiblePane::Layout() { - wxSize btnSz = m_pButton->GetSize(); +#ifdef __WXMAC__ + if (!m_pButton || !m_pPane || !m_sz) + return false; // we need to complete the creation first! +#else + if (!m_pButton || !m_pStaticLine || !m_pPane || !m_sz) + return false; // we need to complete the creation first! +#endif + + wxSize oursz(GetSize()); + + // move & resize the button and the static line + m_sz->SetDimension(0, 0, oursz.GetWidth(), m_sz->GetMinSize().GetHeight()); + m_sz->Layout(); - // the button position & size are always ok... + if ( IsExpanded() ) + { + // move & resize the container window + int yoffset = m_sz->GetSize().GetHeight() + GetBorder(); + m_pPane->SetSize(0, yoffset, + oursz.x, oursz.y - yoffset); + + // this is very important to make the pane window layout show correctly + m_pPane->Layout(); + } - // move & resize the static line - m_pStatLine->SetSize(btnSz.x + wxCP_MARGIN, btnSz.y/2, - GetSize().x - btnSz.x - wxCP_MARGIN, -1, - wxSIZE_USE_EXISTING); + return true; +} - // move & resize the container window - m_pPane->SetSize(0, btnSz.y + wxCP_MARGIN, - GetSize().x, GetSize().y - btnSz.y - wxCP_MARGIN); +int wxGenericCollapsiblePane::GetBorder() const +{ +#if defined( __WXMAC__ ) + return 6; +#elif defined(__WXMSW__) + wxASSERT(m_pButton); + return m_pButton->ConvertDialogToPixels(wxSize(2, 0)).x; +#else + return 5; +#endif } @@ -219,12 +295,7 @@ void wxGenericCollapsiblePane::OnSize(wxSizeEvent& WXUNUSED(event)) dc.DrawRectangle(wxPoint(0,0), GetBestSize()); #endif - - if (!m_pButton || !m_pStatLine || !m_pPane) - return; // we need to complete the creation first! - - LayoutChildren(); - - // this is very important to make the pane window layout show correctly - m_pPane->Layout(); + Layout(); } + +#endif // wxUSE_COLLPANE && wxUSE_BUTTON && wxUSE_STATLINE