X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/550d433e523dc462c62a2346c0fd713a1d5705e8..16487a6fde0a205051f4a8a573ef5da2158f4d83:/src/gtk/collpane.cpp?ds=sidebyside diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index ced9096279..f50d3b270c 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -17,14 +17,23 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __WXGTK24__ +#if wxUSE_COLLPANE && !defined(__WXUNIVERSAL__) #include "wx/collpane.h" +#include "wx/toplevel.h" +#include "wx/sizer.h" +#include "wx/panel.h" -#include -#include +#include "wx/gtk/private.h" -const wxChar wxCollapsiblePaneNameStr[] = wxT("CollapsiblePane"); +// the lines below duplicate the same definitions in collpaneg.cpp, if we have +// another implementation of this class we should extract them to a common file + +const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane"); + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED) + +IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) // ============================================================================ // implementation @@ -36,9 +45,10 @@ const wxChar wxCollapsiblePaneNameStr[] = wxT("CollapsiblePane"); extern "C" { -static void gtk_collapsiblepane_expanded_callback (GObject *object, - GParamSpec *param_spec, - wxCollapsiblePane *p) +static void +gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), + GParamSpec * WXUNUSED(param_spec), + wxCollapsiblePane *p) { // NB: unlike for the "activate" signal, when this callback is called, if // we try to query the "collapsed" status through p->IsCollapsed(), we @@ -50,18 +60,16 @@ static void gtk_collapsiblepane_expanded_callback (GObject *object, wxSize sz; if ( p->IsExpanded() ) { - // unfortunately there's no clean way to retrieve the minimal size of - // the expanded pane in this handler or in other handlers for the - // signals generated by user clicks on the GtkExpander button: - // p->GetBestSize() or p->GetMinSize() would still return the size for - // the collapsed expander even if the collapsed->expanded transition - // has already been completed (this because GTK+ queues some resize - // calls which still must be processed). So, the only solution to - // correctly set the size hints for this window is to calculate the - // expanded size ourselves, without relying on p->Get[Best|Min]Size: - sz = p->GetMinSize(); - sz.SetWidth(wxMax(sz.x, p->GetPane()->GetMinSize().x)); - sz.SetHeight(sz.y + p->GetPane()->GetMinSize().y + 10); + // NB: we cannot use the p->GetBestSize() or p->GetMinSize() functions + // here as they would return the size for the collapsed expander + // even if the collapsed->expanded transition has already been + // completed; we solve this problem doing: + + sz = p->m_szCollapsed; + + wxSize panesz = p->GetPane()->GetBestSize(); + sz.x = wxMax(sz.x, panesz.x); + sz.y += gtk_expander_get_spacing(GTK_EXPANDER(p->m_widget)) + panesz.y; } else // collapsed { @@ -72,30 +80,56 @@ static void gtk_collapsiblepane_expanded_callback (GObject *object, sz = p->m_szCollapsed; } - // minimal size has priority over the best size so set here our min size + // VERY IMPORTANT: + // just calling + // p->OnStateChange(sz); + // here would work work BUT: + // 1) in the expanded->collapsed transition it provokes a lot of flickering + // 2) in the collapsed->expanded transition using the "Change status" wxButton + // in samples/collpane application some strange warnings would be generated + // by the "clearlooks" theme, if that's your theme. + // + // So we prefer to use some GTK+ native optimized calls, which prevent too many resize + // calculations to happen. Note that the following code has been very carefully designed + // and tested - be VERY careful when changing it! + + // 1) need to update our size hints + // NB: this function call won't actually do any long operation + // (redraw/relayouting/resizing) so that it's flicker-free p->SetMinSize(sz); - p->SetSize(sz); - wxWindow *top = p->GetTopLevelParent(); - if (top) + if (p->HasFlag(wxCP_NO_TLW_RESIZE)) { - // we've changed our size, thus our top level parent needs to relayout - // itself - top->Layout(); + // fire an event + wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); + p->HandleWindowEvent(ev); - if (p->IsExpanded()) - { - // force our parent to "fit", i.e. expand so that it can honour - // our minimal size - top->Fit(); - } - else // correctly - { - if (top->GetSizer()) - top->GetSizer()->SetSizeHints(top); + // the user asked to explicitely handle the resizing itself... + return; + } - // use SetClientSize() and not SetSize() otherwise the size for - // e.g. a wxFrame with a menubar wouldn't be correctly set + wxTopLevelWindow * + top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow); + if ( top && top->GetSizer() ) + { + // 2) recalculate minimal size of the top window + sz = top->GetSizer()->CalcMin(); + + if (top->m_mainWidget) + { + // 3) MAGIC HACK: if you ever used GtkExpander in a GTK+ program you know + // that this magic call is required to make it possible to shrink the + // top level window in the expanded->collapsed transition. + // This may be sometimes undesired but *is* necessary and if you look + // carefully, all GTK+ programs using GtkExpander perform this trick + // (e.g. the standard "open file" dialog of GTK+>=2.4 is not resizeable + // when the expander is collapsed!) + gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded()); + + // 4) set size hints + top->SetSizeHints(sz.x, sz.y); + + // 5) set size top->SetClientSize(sz); } } @@ -109,7 +143,7 @@ static void gtk_collapsiblepane_expanded_callback (GObject *object, // fire an event wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); - p->GetEventHandler()->ProcessEvent(ev); + p->HandleWindowEvent(ev); } } @@ -128,9 +162,9 @@ gtk_collapsiblepane_insert_callback(wxWindowGTK* parent, wxWindowGTK* child) // wxCollapsiblePane //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxGenericCollapsiblePane) +IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxControl) -BEGIN_EVENT_TABLE(wxCollapsiblePane, wxGenericCollapsiblePane) +BEGIN_EVENT_TABLE(wxCollapsiblePane, wxCollapsiblePaneBase) EVT_SIZE(wxCollapsiblePane::OnSize) END_EVENT_TABLE() @@ -143,12 +177,6 @@ bool wxCollapsiblePane::Create(wxWindow *parent, const wxValidator& val, const wxString& name) { - if (gtk_check_version(2,4,0)) - return wxGenericCollapsiblePane::Create(parent, id, label, - pos, size, style, val, name); - - m_needParent = true; - m_acceptsFocus = true; m_bIgnoreNextChange = false; if ( !PreCreation( parent, pos, size ) || @@ -158,7 +186,8 @@ bool wxCollapsiblePane::Create(wxWindow *parent, return false; } - m_widget = gtk_expander_new(label.c_str()); + m_widget = + gtk_expander_new_with_mnemonic(wxGTK_CONV(GTKConvertMnemonics(label))); // see the gtk_collapsiblepane_expanded_callback comments to understand why // we connect to the "notify::expanded" signal instead of the more common @@ -171,10 +200,10 @@ bool wxCollapsiblePane::Create(wxWindow *parent, m_insertCallback = gtk_collapsiblepane_insert_callback; // this the real "pane" - m_pPane = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxNO_BORDER); + m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, + wxTAB_TRAVERSAL|wxNO_BORDER); - gtk_widget_show( GTK_WIDGET(m_widget) ); + gtk_widget_show(m_widget); m_parent->DoAddChild( this ); PostCreation(size); @@ -187,53 +216,42 @@ bool wxCollapsiblePane::Create(wxWindow *parent, wxSize wxCollapsiblePane::DoGetBestSize() const { - if (!gtk_check_version(2,4,0)) - { - wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); - - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); + wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); - // notice that we do not cache our best size here as it changes - return wxSize(req.width, req.height); - } + GtkRequisition req; + req.width = 2; + req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) + (m_widget, &req ); - return wxGenericCollapsiblePane::DoGetBestSize(); + // notice that we do not cache our best size here as it changes + // all times the user expands/hide our pane + return wxSize(req.width, req.height); } void wxCollapsiblePane::Collapse(bool collapse) { - if (!gtk_check_version(2,4,0)) - { - // optimization - if (IsCollapsed() == collapse) - return; + // optimization + if (IsCollapsed() == collapse) + return; - // do not send event in next signal handler call - m_bIgnoreNextChange = true; - gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse); - } - else - wxGenericCollapsiblePane::Collapse(collapse); + // do not send event in next signal handler call + m_bIgnoreNextChange = true; + gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse); } bool wxCollapsiblePane::IsCollapsed() const { - if (!gtk_check_version(2,4,0)) - return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget)); - - return wxGenericCollapsiblePane::IsCollapsed(); + return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget)); } void wxCollapsiblePane::SetLabel(const wxString &str) { - if (!gtk_check_version(2,4,0)) - gtk_expander_set_label(GTK_EXPANDER(m_widget), str.c_str()); - else - wxGenericCollapsiblePane::SetLabel(str); + gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str)); + + // FIXME: we need to update our collapsed width in some way but using GetBestSize() + // we may get the size of the control with the pane size summed up if we are expanded! + //m_szCollapsed.x = GetBestSize().x; } void wxCollapsiblePane::OnSize(wxSizeEvent &ev) @@ -249,12 +267,12 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev) // here we need to resize the pane window otherwise, even if the GtkExpander container // is expanded or shrinked, the pane window won't be updated! - m_pPane->SetSize(ev.GetSize()); + m_pPane->SetSize(ev.GetSize().x, ev.GetSize().y - m_szCollapsed.y); // we need to explicitely call m_pPane->Layout() or else it won't correctly relayout // (even if SetAutoLayout(true) has been called on it!) m_pPane->Layout(); } -#endif // __WXGTK24__ +#endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)