3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 11:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX:change checkbox to wxcheckbox in objecttable page

Browse source 
Change-Id: I31ab4255a92d0c32e3d7252b08d0535ab71ab9d4
This commit is contained in:
tao wang 2022-08-19 14:49:52 +08:00 • committed by Lane.Wei
parent 5a2b0e845e
commit aff7afc8de
1 changed files with 54 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/slic3r/GUI/GUI_ObjectTable.cpp
View file

@ -644,7 +644,58 @@ void GridCellSupportRenderer::Draw(wxGrid& grid,
wxRendererNative::Get().DrawCheckBox( &grid, dc, text_rect, flags ); wxRendererNative::Get().DrawCheckBox( &grid, dc, text_rect, flags );
}*/ }*/
wxGridCellBoolRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
//wxGridCellBoolRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
ObjectGridTable * table = dynamic_cast<ObjectGridTable *>(grid.GetTable());
ObjectGridTable::ObjectGridCol *grid_col = table->get_grid_col(col);
ObjectGridTable::ObjectGridRow *grid_row = table->get_grid_row(row - 1);
ConfigOptionBool & cur_option = dynamic_cast<ConfigOptionBool &>((*grid_row)[(ObjectGridTable::GridColType) col]);
auto height = grid.GetRowSize(row);
auto width = grid.GetColSize(col);
wxGridCellRenderer::Draw(grid, attr, dc, rect, row, col, isSelected);
if (cur_option.value) {
auto check_on = create_scaled_bitmap("check_on", nullptr, 18);
dc.SetPen(*wxTRANSPARENT_PEN);
auto offsetx = 0;
auto offsety = 0;
#ifdef __WXOSX_MAC__
offsetx = (width - 18) / 2;
offsety = (height - 18) / 2;
#else
offsetx = (width - check_on.GetSize().x) / 2;
offsety = (height - check_on.GetSize().y) / 2;
#endif // __WXOSX_MAC__
dc.DrawBitmap(check_on, rect.x + offsetx, rect.y + offsety);
//dc.SetBrush(wxBrush(wxColour(0x00, 0xAE, 0x42)));
//dc.DrawBitmap(check_on, (width - check_on.GetSize().x) / 2, (height - check_on.GetSize().y) / 2);
} else {
auto check_off = create_scaled_bitmap("check_off_focused", nullptr, 18);
dc.SetPen(*wxTRANSPARENT_PEN);
auto offsetx = 0;
auto offsety = 0;
#ifdef __WXOSX_MAC__
offsetx = (width - 18) / 2;
offsety = (height - 18) / 2;
#else
offsetx = (width - check_off.GetSize().x) / 2;
offsety = (height - check_off.GetSize().y) / 2;
#endif // __WXOSX_MAC__
dc.DrawBitmap(check_off, rect.x + offsetx, rect.y + offsety);
//dc.SetBrush(wxBrush(wxColour(0x00, 0xAE, 0x42)));
//dc.DrawBitmap(check_off, (width - check_off.GetSize().x) / 2, (height - check_off.GetSize().y) / 2);
}
} }
wxSize GridCellSupportRenderer::GetBestSize(wxGrid& grid, wxSize GridCellSupportRenderer::GetBestSize(wxGrid& grid,
@ -2108,7 +2159,7 @@ void ObjectGridTable::update_row_properties()
grid_table->SetCellEditor(row, col, new GridCellSupportEditor()); grid_table->SetCellEditor(row, col, new GridCellSupportEditor());
//grid_table->SetCellEditor(row, col, new wxGridCellBoolEditor()); //grid_table->SetCellEditor(row, col, new wxGridCellBoolEditor());
//grid_table->SetCellRenderer(row, col, new GridCellSupportRenderer()); //grid_table->SetCellRenderer(row, col, new GridCellSupportRenderer());
grid_table->SetCellRenderer(row, col, new wxGridCellBoolRenderer()); grid_table->SetCellRenderer(row, col, new GridCellSupportRenderer());
break; break;
case coInt: case coInt:
grid_table->SetCellEditor(row, col, new GridCellTextEditor()); grid_table->SetCellEditor(row, col, new GridCellTextEditor());
@ -2808,7 +2859,7 @@ void ObjectTablePanel::load_data()
m_object_grid->SetCellEditor(row, col, new GridCellSupportEditor()); m_object_grid->SetCellEditor(row, col, new GridCellSupportEditor());
//m_object_grid->SetCellEditor(row, col, new wxGridCellBoolEditor()); //m_object_grid->SetCellEditor(row, col, new wxGridCellBoolEditor());
//m_object_grid->SetCellRenderer(row, col, new GridCellSupportRenderer()); //m_object_grid->SetCellRenderer(row, col, new GridCellSupportRenderer());
m_object_grid->SetCellRenderer(row, col, new wxGridCellBoolRenderer()); m_object_grid->SetCellRenderer(row, col, new GridCellSupportRenderer());
break; break;
case coInt: case coInt:
m_object_grid->SetCellEditor(row, col, new GridCellTextEditor()); m_object_grid->SetCellEditor(row, col, new GridCellTextEditor());