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

Merge branch 'main' into belt-printer

Browse Source
This commit is contained in:
Joseph Robertson
2026-10-07 14:14:20 -05:00
committed by GitHub
parent 827efc3bc2 e027f8b225
commit e39d6cc089
241 changed files with 1047 additions and 1771 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/GUI_ObjectList.cpp
+2 -2
View File
@@ -1108,7 +1108,7 @@ void ObjectList::update_name_column_width() const
}
}
GetColumn(colName)->SetWidth(max(0, client_size.x - (others_width)*em));
GetColumn(colName)->SetWidth(std::max(0, client_size.x - (others_width)*em));
}
void ObjectList::set_filament_column_hidden(const bool hide) const
@@ -3970,7 +3970,7 @@ wxDataViewItem ObjectList::add_settings_item(wxDataViewItem parent_item, const D
if (config->opt_float("layer_height") == object_cfg->opt_float("layer_height")) {
SettingsFactory::Bundle new_cat_options;
for (auto cat_opt : cat_options) {
std::vector<string> temp;
std::vector<std::string> temp;
for (auto value : cat_opt.second) {
if (value != "layer_height")
temp.push_back(value);