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

11
src/gtk/collpane.cpp
View File

@@ -99,16 +99,8 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
// (redraw/relayout/resize) so that it's flicker-free // (redraw/relayout/resize) so that it's flicker-free
p->SetMinSize(sz); 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 * wxTopLevelWindow *
top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow); top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow);
if ( top && top->GetSizer() ) if ( top && top->GetSizer() )
@@ -135,6 +127,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
top->SetClientSize(sz); top->SetClientSize(sz);
} }
} }
}
if ( p->m_bIgnoreNextChange ) if ( p->m_bIgnoreNextChange )
{ {