make wxCollapsiblePane blend into its parent background by using the same background colour as it does
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3c9a70ddd4
commit
5c23470650
@ -68,7 +68,7 @@ gtk_collpane_map_unmap_callback( GtkWidget *WXUNUSED(pane), GdkEvent *WXUNUSED(e
|
||||
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;
|
||||
}
|
||||
|
||||
@ -167,6 +167,11 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
|
||||
|
||||
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;
|
||||
@ -246,10 +251,10 @@ 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();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user