X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d625fc6a8357c5b708f38ff0a412bd0a6f7582..d07f2e19181bc5caf29eb2338ce513be6fa42405:/src/gtk/collpane.cpp diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index 2ad79ed21d..cfda20564c 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -17,15 +17,25 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) +#if wxUSE_COLLPANE && !defined(__WXUNIVERSAL__) #include "wx/collpane.h" +#include "wx/toplevel.h" +#include "wx/sizer.h" +#include "wx/panel.h" + +#include #include "wx/gtk/private.h" -#include "wx/gtk/win_gtk.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"; -#include +wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent ); -const wxChar wxCollapsiblePaneNameStr[] = wxT("CollapsiblePane"); +IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) // ============================================================================ // implementation @@ -37,9 +47,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 @@ -71,33 +82,31 @@ static void gtk_collapsiblepane_expanded_callback (GObject *object, sz = p->m_szCollapsed; } -#if 1 - // this does work but in the expanded->collapsed transition it provokes - // a lot of flicker!!! - // - // It also has the problem that in the collapsed->expanded transition with the - // "clearlooks" GTK theme I get: - // - // ** (collpane:18928): CRITICAL **: clearlooks_style_draw_focus: assertion `height >= -1' failed - // ** (collpane:18928): CRITICAL **: clearlooks_style_draw_focus: assertion `height >= -1' failed + // 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. // - // Not sure however if this is a ClearLooks bug or rather my bug. - // Note that those warnings only appear: - // 1) if you're using clearlooks theme - // 2) if you use the "Change status" wxButton in samples/collpane application - p->OnStateChange(sz); + // 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! -#else // flicker-free code - - - // need to update our size hints + // 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 + // (redraw/relayout/resize) so that it's flicker-free p->SetMinSize(sz); if (p->HasFlag(wxCP_NO_TLW_RESIZE)) { - // the user asked to explicitely handle the resizing itself... + // fire an event + wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); + p->HandleWindowEvent(ev); + + // the user asked to explicitly handle the resizing itself... return; } @@ -105,61 +114,29 @@ static void gtk_collapsiblepane_expanded_callback (GObject *object, top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow); if ( top && top->GetSizer() ) { - // recalculate minimal size of the top window - wxSize sz = top->GetSizer()->CalcMin(); - - // FIXME: - // THE PROBLEM WITH THIS CODE IS THAT IN THE EXPANDED->COLLAPSED TRANSITION - // IT DOES *NOT* SHRINK THE TOP WINDOW. - // However it's flicker-free, native code and it also does not have the - // ** (collpane:18928): CRITICAL **: clearlooks_style_draw_focus: assertion `height >= -1' failed - // problem + // 2) recalculate minimal size of the top window + sz = top->GetSizer()->CalcMin(); if (top->m_mainWidget) { - wxLogDebug(wxT("setting min size to %d;%d"), sz.x, sz.y); - - // set size hints - GdkGeometry geom; - - geom.min_width = sz.x; - geom.min_height = sz.y; - - gtk_window_set_geometry_hints( GTK_WINDOW(top->m_widget), - (GtkWidget*) NULL, - &geom, - GDK_HINT_MIN_SIZE ); - //gtk_window_set_default_size( GTK_WINDOW(top->m_widget), sz.x, sz.y ); - - - /* I revert back to wxGTK's original behaviour. m_mainWidget holds the - * menubar, the toolbar and the client area, which is represented by - * m_wxwindow. - * this hurts in the eye, but I don't want to call SetSize() - * because I don't want to call any non-native functions here. */ - - top->m_width = sz.x; - top->m_height = sz.y; - - int client_x = top->m_miniEdge; - int client_y = top->m_miniEdge + top->m_miniTitle; - int client_w = top->m_width - 2*top->m_miniEdge; - int client_h = top->m_height - 2*top->m_miniEdge - top->m_miniTitle; - if (client_w < 0) - client_w = 0; - if (client_h < 0) - client_h = 0; - - // Let the parent perform the resize - gtk_pizza_set_size( GTK_PIZZA(top->m_mainWidget), - top->m_wxwindow, - client_x, client_y, client_w, client_h ); - - gtk_widget_set_size_request( top->m_wxwindow, sz.x, sz.y ); - + // 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 resizable when the expander is + // collapsed!) + gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded()); + + // 4) set size hints + top->SetMinClientSize(sz); + + // 5) set size + top->SetClientSize(sz); } } -#endif + if ( p->m_bIgnoreNextChange ) { // change generated programmatically - do not send an event! @@ -169,28 +146,27 @@ 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); } } -static void -gtk_collapsiblepane_insert_callback(wxWindowGTK* parent, wxWindowGTK* child) +void wxCollapsiblePane::AddChildGTK(wxWindowGTK* child) { - // this callback should be used only once to insert the "pane" into the + // should be used only once to insert the "pane" into the // GtkExpander widget. wxGenericCollapsiblePane::DoAddChild() will check if // it has been called only once (and in any case we would get a warning // from the following call as GtkExpander is a GtkBin and can contain only // a single child!). - gtk_container_add (GTK_CONTAINER (parent->m_widget), child->m_widget); + gtk_container_add(GTK_CONTAINER(m_widget), child->m_widget); } //----------------------------------------------------------------------------- // 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() @@ -203,12 +179,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 ) || @@ -220,6 +190,7 @@ bool wxCollapsiblePane::Create(wxWindow *parent, m_widget = gtk_expander_new_with_mnemonic(wxGTK_CONV(GTKConvertMnemonics(label))); + g_object_ref(m_widget); // see the gtk_collapsiblepane_expanded_callback comments to understand why // we connect to the "notify::expanded" signal instead of the more common @@ -227,19 +198,19 @@ bool wxCollapsiblePane::Create(wxWindow *parent, g_signal_connect(m_widget, "notify::expanded", G_CALLBACK(gtk_collapsiblepane_expanded_callback), this); - // before creating m_pPane, we need to makesure our own insert callback - // will be used - 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, wxS("wxCollapsiblePanePane")); - gtk_widget_show( GTK_WIDGET(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 m_szCollapsed = GetBestSize(); @@ -248,60 +219,45 @@ 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 ); - - // 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); - } + wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); + + 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 - 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), 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! - //m_szCollapsed.x = GetBestSize().x; - } - else - wxGenericCollapsiblePane::SetLabel(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) @@ -316,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(); } -#endif // wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) + +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__)