cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gtk/collpane.cpp
View File

@ -68,10 +68,10 @@ 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;
} }
wxTopLevelWindow * wxTopLevelWindow *
top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow); top = wxDynamicCast(wxGetTopLevelParent(p), wxTopLevelWindow);
if ( top && top->GetSizer() ) if ( top && top->GetSizer() )
@ -157,30 +157,35 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
g_signal_connect_after(m_widget, "notify::expanded", g_signal_connect_after(m_widget, "notify::expanded",
G_CALLBACK(gtk_collapsiblepane_expanded_callback), this); G_CALLBACK(gtk_collapsiblepane_expanded_callback), this);
// this the real "pane" // this the real "pane"
m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTAB_TRAVERSAL|wxNO_BORDER, wxT("wxCollapsiblePanePane") ); wxTAB_TRAVERSAL|wxNO_BORDER, wxT("wxCollapsiblePanePane") );
gtk_widget_show(m_widget); gtk_widget_show(m_widget);
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );
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;
req.height = 2; req.height = 2;
(* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
(m_widget, &req ); (m_widget, &req );
m_szCollapsed = wxSize( req.width, req.height ); m_szCollapsed = wxSize( req.width, req.height );
g_signal_connect (m_pPane->m_widget, "map_event", g_signal_connect (m_pPane->m_widget, "map_event",
G_CALLBACK (gtk_collpane_map_unmap_callback), this); G_CALLBACK (gtk_collpane_map_unmap_callback), this);
g_signal_connect (m_pPane->m_widget, "unmap_event", g_signal_connect (m_pPane->m_widget, "unmap_event",
G_CALLBACK (gtk_collpane_map_unmap_callback), this); G_CALLBACK (gtk_collpane_map_unmap_callback), this);
return true; return true;
} }
@ -196,7 +201,7 @@ wxSize wxCollapsiblePane::DoGetBestSize() const
sz.x = wxMax(sz.x, panesz.x); sz.x = wxMax(sz.x, panesz.x);
sz.y += gtk_expander_get_spacing(GTK_EXPANDER(m_widget)) + panesz.y; sz.y += gtk_expander_get_spacing(GTK_EXPANDER(m_widget)) + panesz.y;
} }
return sz; return sz;
} }
@ -205,7 +210,7 @@ GdkWindow *wxCollapsiblePane::GTKGetWindow(wxArrayGdkWindows& windows) const
GtkWidget *label = gtk_expander_get_label_widget( GTK_EXPANDER(m_widget) ); GtkWidget *label = gtk_expander_get_label_widget( GTK_EXPANDER(m_widget) );
windows.Add( label->window ); windows.Add( label->window );
windows.Add( m_widget->window ); windows.Add( m_widget->window );
return NULL; return NULL;
} }
@ -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();
} }