Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various wxCollapsiblePane enhancements (re-patch 1577412):

Browse Source 
1. wxUSE_COLLPANE added
2. XRC handler added
3. flicker fixes for the generic version
4. sizing fixes for GTK+ version
5. RTL fixes for the generic version (via wxBoxSizer)
6. better appearance under Mac for the generic version


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-30 20:08:17 +00:00
parent a4c8fc2374
commit 912c39325b
32 changed files with 609 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
src/gtk/collpane.cpp
View File

@@ -17,10 +17,11 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __WXGTK24__
#if wxUSE_COLLPANE && defined( __WXGTK24__ )
#include "wx/collpane.h"
#include "wx/gtk/private.h"
#include "wx/gtk/win_gtk.h"
#include <gtk/gtkexpander.h>
@@ -50,18 +51,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,8 +71,95 @@ 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
//
// 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);
#else // flicker-free code
// 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);
if (p->HasFlag(wxCP_NO_TLW_RESIZE))
{
// the user asked to explicitely handle the resizing itself...
return;
}
wxTopLevelWindow *
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
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 );
}
}
#endif
if ( p->m_bIgnoreNextChange )
{
// change generated programmatically - do not send an event!
@@ -173,6 +259,7 @@ wxSize wxCollapsiblePane::DoGetBestSize() const
(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);
}
@@ -206,7 +293,13 @@ bool wxCollapsiblePane::IsCollapsed() const
void wxCollapsiblePane::SetLabel(const wxString &str)
{
if (!gtk_check_version(2,4,0))
{
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;
}
else
wxGenericCollapsiblePane::SetLabel(str);
}
@@ -224,12 +317,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( __WXGTK24__ )