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

Fix extra wxEVT_COLLAPSIBLEPANE_CHANGED with wxCP_NO_TLW_RESIZE

Browse Source 
A pane using wxCP_NO_TLW_RESIZE would generate wxCollapsiblePaneEvent
even when toggled from a program because the GTK+ callback didn't take
m_bIgnoreNextChange flag into account in this case.

Fix this and also avoid duplicating the code for sending the event.
This commit is contained in:
Vadim Zeitlin
2018-01-20 17:28:20 +01:00
parent d6b88ca399
commit 5c0dfcd5ae
1 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/gtk/collpane.cpp
View File

@@ -99,40 +99,33 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
// (redraw/relayout/resize) so that it's flicker-free
p->SetMinSize(sz);
if (p->HasFlag(wxCP_NO_TLW_RESIZE))
if (!p->HasFlag(wxCP_NO_TLW_RESIZE))
{
// fire an event
wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
p->HandleWindowEvent(ev);
// 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
sz = top->GetSizer()->CalcMin();
if (top->m_mainWidget)
wxTopLevelWindow *
top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow);
if ( top && top->GetSizer() )
{
// 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());
// 2) recalculate minimal size of the top window
sz = top->GetSizer()->CalcMin();
// 4) set size hints
top->SetMinClientSize(sz);
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 resizable when the expander is
// collapsed!)
gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded());
// 5) set size
top->SetClientSize(sz);
// 4) set size hints
top->SetMinClientSize(sz);
// 5) set size
top->SetClientSize(sz);
}
}
}