juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-13 12:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix row spacing in objects list (#14053)

Browse Source 
* Fix row spacing in objects list on MacOS
* Update for windows and linux
* Update row height for a more compact look while maintaining some spacing
This commit is contained in:
Ioannis Giannakas
2026-06-06 01:23:34 +03:00
committed by GitHub
parent 57535f30ba
commit d5638273c6
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@@ -514,6 +514,16 @@ void ObjectList::create_objects_ctrl()
for (int cn = colName; cn < colCount; cn++) for (int cn = colName; cn < colCount; cn++)
GetColumn(cn)->SetWidth(m_columns_width[cn] * em); GetColumn(cn)->SetWidth(m_columns_width[cn] * em);
#endif #endif
// Force an explicit row height on all platforms so the object-list spacing is
// consistent and the filament colour badge (2*em tall, see
// get_extruder_color_icons()) always fits. This is required on macOS, where wx
// 3.3's native wxDataViewCtrl uses a fixed font-line-height row and does NOT
// grow it to fit custom renderers' GetSize() (badges would otherwise overflow
// and merge into adjacent rows); on Windows/Linux the generic control normally
// derives the height from the renderers, but we set it here too so all
// platforms match.
SetRowHeight(2 * em + FromDIP(2));
} }
void ObjectList::get_selected_item_indexes(int& obj_idx, int& vol_idx, const wxDataViewItem& input_item/* = wxDataViewItem(nullptr)*/) void ObjectList::get_selected_item_indexes(int& obj_idx, int& vol_idx, const wxDataViewItem& input_item/* = wxDataViewItem(nullptr)*/)
@@ -6337,6 +6347,11 @@ void ObjectList::msw_rescale()
for (int cn = colName; cn < colCount; cn++) for (int cn = colName; cn < colCount; cn++)
GetColumn(cn)->SetWidth(m_columns_width[cn] * em); GetColumn(cn)->SetWidth(m_columns_width[cn] * em);
// Keep the explicit row height (see create_objects_ctrl) in sync with the
// rescaled em so the filament colour badge keeps fitting after a DPI or theme
// change.
SetRowHeight(2 * em + FromDIP(2));
// rescale/update existing items with bitmaps // rescale/update existing items with bitmaps
m_objects_model->Rescale(); m_objects_model->Rescale();