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

Add possibility to use sizers in ribbon panel, fixes #12404: wxRibbonPanel and wxSizer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2010-08-29 09:42:55 +00:00
parent c063e45035
commit 66ddc77b88
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
samples/ribbon/ribbondemo.cpp
View File

@@ -27,6 +27,8 @@
#include "wx/dcbuffer.h"
#include "wx/colordlg.h"
#include "wx/artprov.h"
#include "wx/combobox.h"
#include "wx/wrapsizer.h"
// -- application --
@@ -247,9 +249,26 @@ MyFrame::MyFrame()
shapes->AddButton(ID_SQUARE, wxT("Square"), wxBitmap(square_xpm), wxEmptyString);
shapes->AddDropdownButton(ID_POLYGON, wxT("Other Polygon"), wxBitmap(hexagon_xpm), wxEmptyString);
new wxRibbonPanel(home, wxID_ANY, wxT("Another Panel"), wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxRIBBON_PANEL_EXT_BUTTON);
}
{
wxRibbonPanel *sizer_panel = new wxRibbonPanel(home, wxID_ANY, wxT("Panel with Sizer"),
wxNullBitmap, wxDefaultPosition, wxDefaultSize,
wxRIBBON_PANEL_EXT_BUTTON);
wxArrayString as;
as.Add("Item 1");
as.Add("Item 2");
wxComboBox* sizer_panelcombo = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, as, wxCB_READONLY);
wxComboBox* sizer_panelcombo2 = new wxComboBox(sizer_panel, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, as, wxCB_READONLY);
sizer_panelcombo->SetMinSize(wxSize(150, -1));
sizer_panelcombo2->SetMinSize(wxSize(150, -1));
wxSizer* sizer_panelsizer = new wxWrapSizer(wxHORIZONTAL);
sizer_panelsizer->Add(sizer_panelcombo, 2, wxALL|wxEXPAND, 2);
sizer_panelsizer->Add(sizer_panelcombo2, 2, wxALL|wxEXPAND, 2);
sizer_panel->SetSizer(sizer_panelsizer);
wxFont label_font(8, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_LIGHT);
m_bitmap_creation_dc.SetFont(label_font);

17
src/ribbon/panel.cpp
View File

@@ -577,15 +577,20 @@ bool wxRibbonPanel::Layout()
return true;
}
// TODO: Delegate to a sizer
// Common case of no sizer and single child taking up the entire panel
if(GetChildren().GetCount() == 1)
{
wxWindow* child = GetChildren().Item(0)->GetData();
// Get wxRibbonPanel client size
wxPoint position;
wxClientDC dc(this);
wxSize size = m_art->GetPanelClientSize(dc, this, GetSize(), &position);
// If there is a sizer, use it instead
if ( GetSizer() )
{
GetSizer()->SetDimension(position.x, position.y, size.GetWidth(), size.GetHeight());
}
else if(GetChildren().GetCount() == 1)
{
// Common case of no sizer and single child taking up the entire panel
wxWindow* child = GetChildren().Item(0)->GetData();
child->SetSize(position.x, position.y, size.GetWidth(), size.GetHeight());
}
return true;