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

make wxCollapsiblePane blend into its parent background by using the same background colour as it does

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-17 23:34:46 +00:00
parent 3c9a70ddd4
commit 5c23470650
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/collpane.cpp
View File

@@ -68,7 +68,7 @@ gtk_collpane_map_unmap_callback( GtkWidget *WXUNUSED(pane), GdkEvent *WXUNUSED(e
wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed()); wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
p->HandleWindowEvent(ev); p->HandleWindowEvent(ev);
// the user asked to explicitely handle the resizing itself... // the user asked to explicitly handle the resizing itself...
return; return;
} }
@@ -167,6 +167,11 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
PostCreation(size); 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 // remember the size of this control when it's collapsed
GtkRequisition req; GtkRequisition req;
req.width = 2; req.width = 2;
@@ -246,10 +251,10 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
#endif #endif
// here we need to resize the pane window otherwise, even if the GtkExpander container // 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); 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!) // (even if SetAutoLayout(true) has been called on it!)
m_pPane->Layout(); m_pPane->Layout();
} }