X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c1f8cb1f5cbef0f7699110fd28027948e644c6f..883ea3bf80503de1f2aa797ce91acda654d88d74:/src/generic/collpaneg.cpp diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp index f8f7f3fcbc..ae5f0cde3c 100644 --- a/src/generic/collpaneg.cpp +++ b/src/generic/collpaneg.cpp @@ -16,14 +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/statline.h" +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + // ============================================================================ // implementation // ============================================================================ -const wxChar wxGenericCollapsiblePaneNameStr[] = wxT("genericCollapsiblePane"); +const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane"); //----------------------------------------------------------------------------- // wxGenericCollapsiblePane @@ -34,145 +50,223 @@ IMPLEMENT_DYNAMIC_CLASS(wxGenericCollapsiblePane, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl) - EVT_BUTTON(wxCP_BUTTON_ID, wxGenericCollapsiblePane::OnButton) + EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton) EVT_SIZE(wxGenericCollapsiblePane::OnSize) END_EVENT_TABLE() -bool wxGenericCollapsiblePane::Create( wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& val, - const wxString& name) +bool wxGenericCollapsiblePane::Create(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& val, + const wxString& name) { if ( !wxControl::Create(parent, id, pos, size, style, val, name) ) return false; m_strLabel = label; - // create children; their size & position is set in OnSize() - m_pButton = new wxButton(this, wxCP_BUTTON_ID, GetBtnLabel(), wxPoint(0, 0), + // 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); +#ifdef __WXMAC__ + // on Mac we put the static libe above the button + m_sz = new wxBoxSizer(wxVERTICAL); + m_sz->Add(m_pStaticLine, 0, wxALL|wxGROW, GetBorder()); + m_sz->Add(m_pButton, 0, wxLEFT|wxRIGHT|wxBOTTOM, GetBorder()); +#else + // 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__) && !defined(__WXGTK20__)) + 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_pStaticLine && m_sz) + { + m_pButton->SetContainingSizer(NULL); + m_pStaticLine->SetContainingSizer(NULL); - // set width - sz.SetWidth( sz.GetWidth() + wxCP_MARGIN + m_pStatLine->GetBestSize().GetWidth() ); - sz.SetWidth( wxMax(sz.GetWidth(), m_pPane->GetBestSize().GetWidth()) ); + // our sizer is not deleted automatically since we didn't use SetSizer()! + wxDELETE(m_sz); + } +} + +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 (!IsCollapsed()) - sz.SetHeight( sz.GetHeight() + wxCP_MARGIN + m_pPane->GetBestSize().GetHeight() ); + if ( IsExpanded() ) + { + sz.SetWidth(wxMax( sz.GetWidth(), m_pPane->GetBestSize().x )); + sz.SetHeight(sz.y + GetBorder() + m_pPane->GetBestSize().y); + } return sz; } wxString wxGenericCollapsiblePane::GetBtnLabel() const { - if (IsCollapsed()) - return m_strLabel + wxT(" >>"); - return m_strLabel + wxT(" <<"); + return m_strLabel + (IsCollapsed() ? wxT(" >>") : wxT(" <<")); } -void wxGenericCollapsiblePane::Collapse(bool collapse) +void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz) { - // optimization - if (IsCollapsed() == collapse) - return; - - // update our state - m_pPane->Show(!collapse); - - // update button label - // NB: this must be done after updating our "state" - m_pButton->SetLabel(GetBtnLabel()); - // minimal size has priority over the best size so set here our min size - wxSize sz = GetBestSize(); SetMinSize(sz); SetSize(sz); - wxWindow *top = GetTopLevelParent(); - 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(); + // the user asked to explicitely handle the resizing itself... + return; + } + + + // + // NB: the following block of code has been accurately designed to + // as much flicker-free as possible; be careful when modifying it! + // + + wxTopLevelWindow * + top = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow); + if ( top ) + { + // NB: don't Layout() the 'top' window as its size has not been correctly + // updated yet and we don't want to do an initial Layout() with the old + // size immediately followed by a SetClientSize/Fit call for the new + // size; that would provoke flickering! - // 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... + // 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()) - { - // NB: we need to use SetClientSize() and not SetSize() otherwise the size for - // windows like e.g. wxFrames with wxMenubars won't be correctly set - top->SetClientSize(sz); - } - else + + // we shouldn't attempt to resize a maximized window, whatever happens + if ( !top->IsMaximized() ) { - // force our parent to "fit", i.e. expand so that it can honour - // our minimal size - top->Fit(); + if ( IsCollapsed() ) + { + // expanded -> collapsed transition + if (top->GetSizer()) + { + // we have just set the size hints... + wxSize szClient = top->GetSizer()->CalcMin(); + + // use SetClientSize() and not SetSize() otherwise the size for + // e.g. a wxFrame with a menubar wouldn't be correctly set + top->SetClientSize(szClient); + } + else + top->Layout(); + } + else + { + // collapsed -> expanded transition + + // force our parent to "fit", i.e. expand so that it can honour + // our minimal size + top->Fit(); + } } } } -wxWindow *wxGenericCollapsiblePane::GetTopLevelParent() +void wxGenericCollapsiblePane::Collapse(bool collapse) { - wxWindow *parent = GetParent(); - while (parent && !parent->IsTopLevel()) - parent = parent->GetParent(); + // optimization + if ( IsCollapsed() == collapse ) + return; + + // update our state + m_pPane->Show(!collapse); + + // update button label + // NB: this must be done after updating our "state" + m_pButton->SetLabel(GetBtnLabel()); - return parent; + OnStateChange(GetBestSize()); } void wxGenericCollapsiblePane::SetLabel(const wxString &label) { m_strLabel = label; m_pButton->SetLabel(GetBtnLabel()); - m_pButton->SetBestFittingSize(); + m_pButton->SetInitialSize(); - LayoutChildren(); + Layout(); } -void wxGenericCollapsiblePane::LayoutChildren() +bool wxGenericCollapsiblePane::Layout() { - wxSize btnSz = m_pButton->GetSize(); + if (!m_pButton || !m_pStaticLine || !m_pPane || !m_sz) + return false; // we need to complete the creation first! - // the button position & size are always ok... + wxSize oursz(GetSize()); - // move & resize the static line - m_pStatLine->SetSize(btnSz.GetWidth() + wxCP_MARGIN, btnSz.GetHeight()/2, - GetSize().GetWidth() - btnSz.GetWidth() - wxCP_MARGIN, -1, - wxSIZE_USE_EXISTING); + // move & resize the button and the static line + m_sz->SetDimension(0, 0, oursz.GetWidth(), m_sz->GetMinSize().GetHeight()); + m_sz->Layout(); - // move & resize the container window - m_pPane->SetSize(0, btnSz.GetHeight() + wxCP_MARGIN, - GetSize().GetWidth(), GetSize().GetHeight() - btnSz.GetHeight() - wxCP_MARGIN); + 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(); + } + + return true; +} + +int wxGenericCollapsiblePane::GetBorder() const +{ +#if defined( __WXMAC__ ) + return 6; +#elif defined(__WXGTK20__) + return 3; +#elif defined(__WXMSW__) + wxASSERT(m_pButton); + return m_pButton->ConvertDialogToPixels(wxSize(2, 0)).x; +#else + return 5; +#endif } @@ -181,8 +275,14 @@ void wxGenericCollapsiblePane::LayoutChildren() // wxGenericCollapsiblePane - event handlers //----------------------------------------------------------------------------- -void wxGenericCollapsiblePane::OnButton(wxCommandEvent &WXUNUSED(event)) +void wxGenericCollapsiblePane::OnButton(wxCommandEvent& event) { + if ( event.GetEventObject() != m_pButton ) + { + event.Skip(); + return; + } + Collapse(!IsCollapsed()); // this change was generated by the user - send the event @@ -201,13 +301,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