X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b53aea81d2e102224b452ef5bf7aee1132f37c6f..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/gtk/collpane.cpp?ds=sidebyside diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index ec04fb67f2..cfda20564c 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -24,14 +24,16 @@ #include "wx/sizer.h" #include "wx/panel.h" +#include #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" // 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 char wxCollapsiblePaneNameStr[] = "collapsiblePane"; -wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent ) +wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent ); IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) @@ -50,34 +52,70 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), GParamSpec * WXUNUSED(param_spec), wxCollapsiblePane *p) { - if (!p->IsCollapsed()) + // NB: unlike for the "activate" signal, when this callback is called, if + // we try to query the "collapsed" status through p->IsCollapsed(), we + // get the right value. I.e. here p->IsCollapsed() will return false if + // this callback has been called at the end of a collapsed->expanded + // transition and viceversa. Inside the "activate" signal callback + // p->IsCollapsed() would return the wrong value! + + wxSize sz; + if ( p->IsExpanded() ) { - if (p->GetPane()->GetSizer()) - p->GetPane()->GetSizer()->Fit( p->GetPane() ); + // 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 + { + // same problem described above: using p->Get[Best|Min]Size() here we + // would get the size of the control when it is expanded even if the + // expanded->collapsed transition should be complete now... + // So, we use the size cached at control-creation time... + sz = p->m_szCollapsed; } -} -} -extern "C" { -static void -gtk_collpane_map_unmap_callback( GtkWidget *WXUNUSED(pane), GdkEvent *WXUNUSED(event), wxCollapsiblePane* p ) -{ + // 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/relayout/resize) so that it's flicker-free + p->SetMinSize(sz); + if (p->HasFlag(wxCP_NO_TLW_RESIZE)) { // fire an event wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); p->HandleWindowEvent(ev); - // the user asked to explicitely handle the resizing itself... + // the user asked to explicitly handle the resizing itself... return; } - + wxTopLevelWindow * top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow); if ( top && top->GetSizer() ) { // 2) recalculate minimal size of the top window - wxSize sz = top->GetSizer()->CalcMin(); + sz = top->GetSizer()->CalcMin(); if (top->m_mainWidget) { @@ -87,7 +125,7 @@ gtk_collpane_map_unmap_callback( GtkWidget *WXUNUSED(pane), GdkEvent *WXUNUSED(e // 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 + // dialog of GTK+>=2.4 is not resizable when the expander is // collapsed!) gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded()); @@ -112,7 +150,6 @@ gtk_collpane_map_unmap_callback( GtkWidget *WXUNUSED(pane), GdkEvent *WXUNUSED(e } } - void wxCollapsiblePane::AddChildGTK(wxWindowGTK* child) { // should be used only once to insert the "pane" into the @@ -155,32 +192,27 @@ bool wxCollapsiblePane::Create(wxWindow *parent, gtk_expander_new_with_mnemonic(wxGTK_CONV(GTKConvertMnemonics(label))); g_object_ref(m_widget); - g_signal_connect_after(m_widget, "notify::expanded", + // see the gtk_collapsiblepane_expanded_callback comments to understand why + // we connect to the "notify::expanded" signal instead of the more common + // "activate" one + g_signal_connect(m_widget, "notify::expanded", G_CALLBACK(gtk_collapsiblepane_expanded_callback), this); - + // this the real "pane" m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTAB_TRAVERSAL|wxNO_BORDER, wxT("wxCollapsiblePanePane") ); + wxTAB_TRAVERSAL|wxNO_BORDER, wxS("wxCollapsiblePanePane")); - gtk_widget_show(m_widget); m_parent->DoAddChild( this ); - + PostCreation(size); + // we should blend into our parent background + const wxColour bg = parent->GetBackgroundColour(); + SetBackgroundColour(bg); + m_pPane->SetBackgroundColour(bg); + // remember the size of this control when it's collapsed - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); - - m_szCollapsed = wxSize( req.width, req.height ); - - g_signal_connect (m_pPane->m_widget, "map_event", - G_CALLBACK (gtk_collpane_map_unmap_callback), this); - g_signal_connect (m_pPane->m_widget, "unmap_event", - G_CALLBACK (gtk_collpane_map_unmap_callback), this); - + m_szCollapsed = GetBestSize(); return true; } @@ -189,15 +221,17 @@ wxSize wxCollapsiblePane::DoGetBestSize() const { wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); - wxSize sz = m_szCollapsed; - if ( IsExpanded() ) - { - wxSize panesz = GetPane()->GetBestSize(); - sz.x = wxMax(sz.x, panesz.x); - sz.y += gtk_expander_get_spacing(GTK_EXPANDER(m_widget)) + panesz.y; - } - - return sz; + GtkRequisition req; +#ifdef __WXGTK3__ + gtk_widget_get_preferred_width(m_widget, NULL, &req.width); + gtk_widget_get_preferred_height_for_width(m_widget, req.width, NULL, &req.height); +#else + GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req); +#endif + + // 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) @@ -218,7 +252,8 @@ bool wxCollapsiblePane::IsCollapsed() const void wxCollapsiblePane::SetLabel(const wxString &str) { - gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str)); + gtk_expander_set_label(GTK_EXPANDER(m_widget), + wxGTK_CONV(GTKConvertMnemonics(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! @@ -237,13 +272,23 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev) #endif // 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! + // is expanded or shrunk, the pane window won't be updated! 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 + // we need to explicitly call m_pPane->Layout() or else it won't correctly relayout // (even if SetAutoLayout(true) has been called on it!) m_pPane->Layout(); } + +GdkWindow *wxCollapsiblePane::GTKGetWindow(wxArrayGdkWindows& windows) const +{ + GtkWidget *label = gtk_expander_get_label_widget( GTK_EXPANDER(m_widget) ); + windows.Add(gtk_widget_get_window(label)); + windows.Add(gtk_widget_get_window(m_widget)); + + return NULL; +} + #endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)