amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add spacing between icons of objects list item if it has multiple icons (#5321)

Browse source 
* Add spacing between icons of node on objects list if node has multiple icons

* Fix usage of operators and move comments to separate line

* Simplified condition and comments

* simplify conditions
This commit is contained in:
yw4z 2024-05-19 05:06:02 +03:00 committed by GitHub
parent ba3016bc3d
commit 3627a6d986
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/ObjectDataViewModel.cpp
View file

@ -558,13 +558,19 @@ void ObjectDataViewModel::UpdateBitmapForNode(ObjectDataViewModelNode *node)
std::vector<wxBitmap> bmps;
if (node->has_warning_icon())
bmps.emplace_back(node->warning_icon_name() == WarningIcon ? m_warning_bmp : m_warning_manifold_bmp);
if (node->has_lock())
if (node->has_lock()) {
if (!bmps.empty()) // ORCA: Add spacing between icons if there are multiple
bmps.emplace_back(create_scaled_bitmap("dot", nullptr, int(wxGetApp().em_unit() / 10) * 4));
bmps.emplace_back(m_lock_bmp);
if (is_volume_node)
}
if (is_volume_node) {
if (!bmps.empty()) // ORCA: Add spacing between icons if there are multiple
bmps.emplace_back(create_scaled_bitmap("dot", nullptr, int(wxGetApp().em_unit() / 10) * 4));
bmps.emplace_back(
node->is_text_volume() ? m_text_volume_bmps[vol_type] :
node->is_svg_volume() ? m_svg_volume_bmps[vol_type] :
m_volume_bmps[vol_type]);
}
bmp = m_bitmap_cache->insert(scaled_bitmap_name, bmps);
}