GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-06 03:37:36 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: clapse filament list min height & adjust filament groups

Browse Source 
Change-Id: Ie4c41b2977addcac4359f161daa46f34dd35054e
Jira: STUDIO-12082, STUDIO-12084, STUDIO-12077
This commit is contained in:
chunmao.guo 2025-05-08 18:18:42 +08:00 committed by lane.wei
parent 59cee48fbf
commit 973399104f
5 changed files with 75 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/Plater.cpp
View File

@ -1744,10 +1744,16 @@ Sidebar::Sidebar(Plater *parent)
if (e.GetPosition().x > (p->m_flushing_volume_btn->IsShown() if (e.GetPosition().x > (p->m_flushing_volume_btn->IsShown()
? p->m_flushing_volume_btn->GetPosition().x : p->m_bpButton_add_filament->GetPosition().x)) ? p->m_flushing_volume_btn->GetPosition().x : p->m_bpButton_add_filament->GetPosition().x))
return; return;
if (p->m_panel_filament_content->GetMaxHeight() == 0) if (p->m_panel_filament_content->GetMaxHeight() == 0) {
p->m_panel_filament_content->SetMaxSize({-1, -1}); p->m_panel_filament_content->SetMaxSize({-1, FromDIP(174)});
else auto min_size = p->m_panel_filament_content->GetSizer()->GetMinSize();
if (min_size.y > p->m_panel_filament_content->GetMaxHeight())
min_size.y = p->m_panel_filament_content->GetMaxHeight();
p->m_panel_filament_content->SetMinSize({-1, min_size.y});
} else {
p->m_panel_filament_content->SetMinSize({-1, 0});
p->m_panel_filament_content->SetMaxSize({-1, 0}); p->m_panel_filament_content->SetMaxSize({-1, 0});
}
m_scrolled_sizer->Layout(); m_scrolled_sizer->Layout();
}); });
@ -3170,7 +3176,11 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn)
for (auto& c : p->combos_filament) for (auto& c : p->combos_filament)
c->update(); c->update();
// Expand filament list // Expand filament list
p->m_panel_filament_content->SetMaxSize({-1, -1}); p->m_panel_filament_content->SetMaxSize({-1, FromDIP(174)});
auto min_size = p->m_panel_filament_content->GetSizer()->GetMinSize();
if (min_size.y > p->m_panel_filament_content->GetMaxHeight())
min_size.y = p->m_panel_filament_content->GetMaxHeight();
p->m_panel_filament_content->SetMinSize({-1, min_size.y});
// BBS:Synchronized consumables information // BBS:Synchronized consumables information
// auto calculation of flushing volumes // auto calculation of flushing volumes
for (int i = 0; i < p->combos_filament.size(); ++i) { for (int i = 0; i < p->combos_filament.size(); ++i) {

45
src/slic3r/GUI/PresetComboBoxes.cpp
View File

@ -346,7 +346,7 @@ void PresetComboBox::update(std::string select_preset_name)
wxString selected = ""; wxString selected = "";
if (!presets.front().is_visible) if (!presets.front().is_visible)
set_label_marker(Append(separator(L("System presets")), wxNullBitmap)); set_label_marker(Append(L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (size_t i = presets.front().is_visible ? 0 : m_collection->num_default_presets(); i < presets.size(); ++i) for (size_t i = presets.front().is_visible ? 0 : m_collection->num_default_presets(); i < presets.size(); ++i)
{ {
@ -376,11 +376,11 @@ void PresetComboBox::update(std::string select_preset_name)
selected = get_preset_name(preset); selected = get_preset_name(preset);
} }
if (i + 1 == m_collection->num_default_presets()) if (i + 1 == m_collection->num_default_presets())
set_label_marker(Append(separator(L("System presets")), wxNullBitmap)); set_label_marker(Append(L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
} }
if (!nonsys_presets.empty()) if (!nonsys_presets.empty())
{ {
set_label_marker(Append(separator(L("User presets")), wxNullBitmap)); set_label_marker(Append(L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
bool is_enabled = it->second.second; bool is_enabled = it->second.second;
@ -391,7 +391,7 @@ void PresetComboBox::update(std::string select_preset_name)
} }
if (!incomp_presets.empty()) if (!incomp_presets.empty())
{ {
set_label_marker(Append(separator(L("Incompatible presets")), wxNullBitmap)); set_label_marker(Append(L("Incompatible presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, wxBitmap*>::iterator it = incomp_presets.begin(); it != incomp_presets.end(); ++it) { for (std::map<wxString, wxBitmap*>::iterator it = incomp_presets.begin(); it != incomp_presets.end(); ++it) {
set_label_marker(Append(it->first, *it->second), LABEL_ITEM_DISABLED); set_label_marker(Append(it->first, *it->second), LABEL_ITEM_DISABLED);
} }
@ -427,7 +427,7 @@ void PresetComboBox::add_connected_printers(std::string selected, bool alias_nam
if (machine_list.empty()) if (machine_list.empty())
return; return;
set_label_marker(Append(separator(L("My Printer")), wxNullBitmap)); set_label_marker(Append(L("My Printer"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
m_first_printer_idx = GetCount(); m_first_printer_idx = GetCount();
// sort list // sort list
@ -476,7 +476,7 @@ bool PresetComboBox::add_ams_filaments(std::string selected, bool alias_name)
bool is_bbl_vendor_preset = m_preset_bundle->printers.get_edited_preset().is_bbl_vendor_preset(m_preset_bundle); bool is_bbl_vendor_preset = m_preset_bundle->printers.get_edited_preset().is_bbl_vendor_preset(m_preset_bundle);
if (is_bbl_vendor_preset && !m_preset_bundle->filament_ams_list.empty()) { if (is_bbl_vendor_preset && !m_preset_bundle->filament_ams_list.empty()) {
bool dual_extruder = (m_preset_bundle->filament_ams_list.begin()->first & 0x10000) == 0; bool dual_extruder = (m_preset_bundle->filament_ams_list.begin()->first & 0x10000) == 0;
set_label_marker(Append(separator(dual_extruder ? L("Left filaments") : L("AMS filaments")), wxNullBitmap)); set_label_marker(Append(dual_extruder ? L("Left filaments") : L("AMS filaments"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
m_first_ams_filament = GetCount(); m_first_ams_filament = GetCount();
auto &filaments = m_collection->get_presets(); auto &filaments = m_collection->get_presets();
@ -491,7 +491,7 @@ bool PresetComboBox::add_ams_filaments(std::string selected, bool alias_name)
for (auto &entry : m_preset_bundle->filament_ams_list) { for (auto &entry : m_preset_bundle->filament_ams_list) {
if (dual_extruder && (entry.first & 0x10000)) { if (dual_extruder && (entry.first & 0x10000)) {
dual_extruder = false; dual_extruder = false;
set_label_marker(Append(separator(L("Right filaments")), wxNullBitmap)); set_label_marker(Append(L("Right filaments"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
} }
auto & tray = entry.second; auto & tray = entry.second;
std::string filament_id = tray.opt_string("filament_id", 0u); std::string filament_id = tray.opt_string("filament_id", 0u);
@ -1232,16 +1232,21 @@ void PlaterPresetComboBox::update()
std::vector<std::string> filament_orders = {"Bambu PLA Basic", "Bambu PLA Matte", "Bambu PETG HF", "Bambu ABS", "Bambu PLA Silk", "Bambu PLA-CF", std::vector<std::string> filament_orders = {"Bambu PLA Basic", "Bambu PLA Matte", "Bambu PETG HF", "Bambu ABS", "Bambu PLA Silk", "Bambu PLA-CF",
"Bambu PLA Galaxy", "Bambu PLA Metal", "Bambu PLA Marble", "Bambu PETG-CF", "Bambu PETG Translucent", "Bambu ABS-GF"}; "Bambu PLA Galaxy", "Bambu PLA Metal", "Bambu PLA Marble", "Bambu PETG-CF", "Bambu PETG Translucent", "Bambu ABS-GF"};
std::vector<std::string> first_vendors = {"Bambu", "Generic"}; std::vector<std::string> first_vendors = {"", "Bambu", "Generic"}; // Empty vendor for non-system presets
std::vector<std::string> first_types = {"PLA", "PETG", "ABS", "TPU"}; std::vector<std::string> first_types = {"PLA", "PETG", "ABS", "TPU"};
auto add_presets = [this, &preset_descriptions, &filament_orders, &preset_filament_vendors, &first_vendors, &preset_filament_types, &first_types, &selected_in_ams] auto add_presets = [this, &preset_descriptions, &filament_orders, &preset_filament_vendors, &first_vendors, &preset_filament_types, &first_types, &selected_in_ams]
(std::map<wxString, wxBitmap *> const &presets, wxString const &selected, std::string const &group) { (std::map<wxString, wxBitmap *> const &presets, wxString const &selected, std::string const &group) {
if (!presets.empty()) { if (!presets.empty()) {
set_label_marker(Append(separator(group), wxNullBitmap)); set_label_marker(Append(group, wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
if (m_type == Preset::TYPE_FILAMENT) { if (m_type == Preset::TYPE_FILAMENT) {
std::vector<std::map<wxString, wxBitmap *>::value_type const*> list(presets.size(), nullptr); std::vector<std::map<wxString, wxBitmap *>::value_type const*> list(presets.size(), nullptr);
std::transform(presets.begin(), presets.end(), list.begin(), [](auto & pair) { return &pair; }); std::transform(presets.begin(), presets.end(), list.begin(), [](auto & pair) { return &pair; });
if (group == "System presets") bool groupByGroup = group != "System presets";
//if (groupByGroup) {
// if (GetCount() == 1) Clear();
// else SetString(GetCount() - 1, "");
//}
if (group == "System presets" || group == "Unsupported presets")
std::sort(list.begin(), list.end(), [&filament_orders, &preset_filament_vendors, &first_vendors, &preset_filament_types, &first_types](auto *l, auto *r) { std::sort(list.begin(), list.end(), [&filament_orders, &preset_filament_vendors, &first_vendors, &preset_filament_types, &first_types](auto *l, auto *r) {
{ // Compare order { // Compare order
auto iter1 = std::find(filament_orders.begin(), filament_orders.end(), l->first); auto iter1 = std::find(filament_orders.begin(), filament_orders.end(), l->first);
@ -1263,11 +1268,13 @@ void PlaterPresetComboBox::update()
} }
return l->first < r->first; return l->first < r->first;
}); });
bool unsupported = group == "Unsupported presets";
for (auto it : list) { for (auto it : list) {
auto vendor = preset_filament_vendors[it->first]; auto groupName = groupByGroup ? group : preset_filament_vendors[it->first];
if (!vendor.empty() && group == "Unsupported presets") int index = Append(it->first, *it->second, groupName, nullptr, unsupported ? DD_ITEM_STYLE_DISABLED : 0);
vendor.push_back(' '); if (unsupported)
SetItemTooltip(Append(it->first, *it->second, vendor), preset_descriptions[it->first]); set_label_marker(index, LABEL_ITEM_DISABLED);
SetItemTooltip(index, preset_descriptions[it->first]);
bool is_selected = it->first == selected; bool is_selected = it->first == selected;
validate_selection(is_selected); validate_selection(is_selected);
if (is_selected && selected_in_ams) { if (is_selected && selected_in_ams) {
@ -1506,7 +1513,7 @@ void TabPresetComboBox::update()
//BBS: add project embedded preset logic //BBS: add project embedded preset logic
if (!project_embedded_presets.empty()) if (!project_embedded_presets.empty())
{ {
set_label_marker(Append(separator(L("Project-inside presets")), wxNullBitmap)); set_label_marker(Append(L("Project-inside presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = project_embedded_presets.begin(); it != project_embedded_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = project_embedded_presets.begin(); it != project_embedded_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
SetItemTooltip(item_id, preset_descriptions[it->first]); SetItemTooltip(item_id, preset_descriptions[it->first]);
@ -1518,7 +1525,7 @@ void TabPresetComboBox::update()
} }
if (!nonsys_presets.empty()) if (!nonsys_presets.empty())
{ {
set_label_marker(Append(separator(L("User presets")), wxNullBitmap)); set_label_marker(Append(L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
SetItemTooltip(item_id, preset_descriptions[it->first]); SetItemTooltip(item_id, preset_descriptions[it->first]);
@ -1531,7 +1538,7 @@ void TabPresetComboBox::update()
//BBS: move system to the end //BBS: move system to the end
if (!system_presets.empty()) if (!system_presets.empty())
{ {
set_label_marker(Append(separator(L("System presets")), wxNullBitmap)); set_label_marker(Append(L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = system_presets.begin(); it != system_presets.end(); ++it) { for (std::map<wxString, std::pair<wxBitmap*, bool>>::iterator it = system_presets.begin(); it != system_presets.end(); ++it) {
int item_id = Append(it->first, *it->second.first); int item_id = Append(it->first, *it->second.first);
SetItemTooltip(item_id, preset_descriptions[it->first]); SetItemTooltip(item_id, preset_descriptions[it->first]);
@ -1765,7 +1772,7 @@ void GUI::CalibrateFilamentComboBox::update()
if (!m_nonsys_presets.empty()) if (!m_nonsys_presets.empty())
{ {
set_label_marker(Append(separator(L("User presets")), wxNullBitmap)); set_label_marker(Append(L("User presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (auto it = m_nonsys_presets.begin(); it != m_nonsys_presets.end(); ++it) { for (auto it = m_nonsys_presets.begin(); it != m_nonsys_presets.end(); ++it) {
Append(it->first, *(it->second.second)); Append(it->first, *(it->second.second));
validate_selection(it->first == selected_preset); validate_selection(it->first == selected_preset);
@ -1773,7 +1780,7 @@ void GUI::CalibrateFilamentComboBox::update()
} }
if (!m_system_presets.empty()) if (!m_system_presets.empty())
{ {
set_label_marker(Append(separator(L("System presets")), wxNullBitmap)); set_label_marker(Append(L("System presets"), wxNullBitmap, DD_ITEM_STYLE_SPLIT_ITEM));
for (auto it = m_system_presets.begin(); it != m_system_presets.end(); ++it) { for (auto it = m_system_presets.begin(); it != m_system_presets.end(); ++it) {
Append(it->first, *(it->second.second)); Append(it->first, *(it->second.second));
validate_selection(it->first == selected_preset); validate_selection(it->first == selected_preset);

8
src/slic3r/GUI/PresetComboBoxes.hpp
View File

@ -157,11 +157,11 @@ protected:
int update_ams_color(); int update_ams_color();
#ifdef __linux__ #ifdef __linux__
static const char* separator_head() { return "------- "; } static const char* separator_head() { return "-- "; }
static const char* separator_tail() { return " -------"; } static const char* separator_tail() { return " --"; }
#else // __linux__ #else // __linux__
static const char* separator_head() { return "------ "; } static const char* separator_head() { return "--"; }
static const char* separator_tail() { return " ------"; } static const char* separator_tail() { return " --"; }
#endif // __linux__ #endif // __linux__
static wxString separator(const std::string& label); static wxString separator(const std::string& label);

36
src/slic3r/GUI/Widgets/DropDown.cpp
View File

@ -36,7 +36,8 @@ DropDown::DropDown(std::vector<Item> &items)
: items(items) : items(items)
, state_handler(this) , state_handler(this)
, border_color(0xDBDBDB) , border_color(0xDBDBDB)
, text_color(0x363636) , text_color(std::make_pair(0x909090, (int) StateColor::Disabled),
std::make_pair(0x363636, (int) StateColor::Normal))
, selector_border_color(std::make_pair(0x00AE42, (int) StateColor::Hovered), , selector_border_color(std::make_pair(0x00AE42, (int) StateColor::Hovered),
std::make_pair(*wxWHITE, (int) StateColor::Normal)) std::make_pair(*wxWHITE, (int) StateColor::Normal))
, selector_background_color(std::make_pair(0xEDFAF2, (int) StateColor::Checked), , selector_background_color(std::make_pair(0xEDFAF2, (int) StateColor::Checked),
@ -269,10 +270,11 @@ void DropDown::render(wxDC &dc)
dc.DrawRoundedRectangle(0, 0, size.x, size.y, radius); dc.DrawRoundedRectangle(0, 0, size.x, size.y, radius);
int selected_item = selectedItem(); int selected_item = selectedItem();
int hover_index = hoverIndex();
// draw hover rectangle // draw hover rectangle
wxRect rcContent = {{0, offset.y}, rowSize}; wxRect rcContent = {{0, offset.y}, rowSize};
if (hover_item >= 0 && (states & StateColor::Hovered) && !(items[hover_item].style & DD_ITEM_STYLE_SPLIT_ITEM)) { if (hover_item >= 0 && (states & StateColor::Hovered) && (hover_index < 0 || !(items[hover_index].style & DD_ITEM_STYLE_SPLIT_ITEM))) {
rcContent.y += rowSize.y * hover_item; rcContent.y += rowSize.y * hover_item;
if (rcContent.GetBottom() > 0 && rcContent.y < size.y) { if (rcContent.GetBottom() > 0 && rcContent.y < size.y) {
if (selected_item == hover_item) if (selected_item == hover_item)
@ -331,17 +333,29 @@ void DropDown::render(wxDC &dc)
std::set<wxString> groups; std::set<wxString> groups;
// draw texts & icons // draw texts & icons
dc.SetTextForeground(text_color.colorForStates(states));
int index = 0; int index = 0;
for (int i = 0; i < items.size(); ++i) { for (int i = 0; i < items.size(); ++i) {
auto &item = items[i]; auto &item = items[i];
int states2 = states;
if ((item.style & DD_ITEM_STYLE_DISABLED) != 0)
states2 &= ~StateColor::Enabled;
// Skip by group // Skip by group
if (group.IsEmpty()) { if (group.IsEmpty()) {
if (!item.group.IsEmpty()) { if (!item.group.IsEmpty()) {
if (groups.find(item.group) == groups.end()) if (groups.find(item.group) != groups.end())
groups.insert(item.group);
else
continue; continue;
groups.insert(item.group);
if (!item.group.IsEmpty()) {
bool disabled = true;
for (int j = i + 1; j < items.size(); ++j) {
if (items[i].group != item.group && (items[j].style & DD_ITEM_STYLE_DISABLED) == 0) {
disabled = false;
break;
}
}
if (!disabled)
states2 |= StateColor::Enabled;
}
} }
} else { } else {
if (item.group != group) if (item.group != group)
@ -393,6 +407,7 @@ void DropDown::render(wxDC &dc)
} }
pt.y += (rcContent.height - textSize.y) / 2; pt.y += (rcContent.height - textSize.y) / 2;
dc.SetFont(GetFont()); dc.SetFont(GetFont());
dc.SetTextForeground(text_color.colorForStates(states2));
dc.DrawText(text, pt); dc.DrawText(text, pt);
if (group.IsEmpty() && !item.group.IsEmpty()) { if (group.IsEmpty() && !item.group.IsEmpty()) {
auto szBmp = arrow_bitmap.GetBmpSize(); auto szBmp = arrow_bitmap.GetBmpSize();
@ -495,6 +510,8 @@ void DropDown::messureSize()
? (item.group.IsEmpty() ? item.text : item.group) ? (item.group.IsEmpty() ? item.text : item.group)
: (item.text.StartsWith(group) ? item.text.substr(group.size()).Trim(false) : item.text); : (item.text.StartsWith(group) ? item.text.substr(group.size()).Trim(false) : item.text);
size1 = dc.GetMultiLineTextExtent(text); size1 = dc.GetMultiLineTextExtent(text);
if (group.IsEmpty() && !item.group.IsEmpty())
size1.x += 5 + arrow_bitmap.GetBmpWidth();
} }
if (item.icon.IsOk()) { if (item.icon.IsOk()) {
wxSize size2 = GetBmpSize(item.icon); wxSize size2 = GetBmpSize(item.icon);
@ -623,10 +640,13 @@ void DropDown::mouseReleased(wxMouseEvent& event)
pressedDown = false; pressedDown = false;
if (HasCapture()) if (HasCapture())
ReleaseMouse(); ReleaseMouse();
if (hover_item >= 0) { // not moved if (hover_item >= 0 && subDropDown == nullptr) { // not moved
sendDropDownEvent(); sendDropDownEvent();
if (mainDropDown)
mainDropDown->hover_item = -1; // To Dismiss mainDropDown
DismissAndNotify(); DismissAndNotify();
} } else if (subDropDown)
subDropDown->Popup(subDropDown);
} }
} }

1
src/slic3r/GUI/Widgets/DropDown.hpp
View File

@ -12,6 +12,7 @@
#define DD_STYLE_MASK 0x0003 #define DD_STYLE_MASK 0x0003
#define DD_ITEM_STYLE_SPLIT_ITEM 0x0001 // ----text----, text with horizontal line arounds #define DD_ITEM_STYLE_SPLIT_ITEM 0x0001 // ----text----, text with horizontal line arounds
#define DD_ITEM_STYLE_DISABLED 0x0002 // ----text----, text with horizontal line arounds
wxDECLARE_EVENT(EVT_DISMISS, wxCommandEvent); wxDECLARE_EVENT(EVT_DISMISS, wxCommandEvent);