juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-14 03:11:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regressions in the AMS filament favorites dropdown

Browse Source
This commit is contained in:
SoftFever
2026-10-12 14:54:17 +08:00
parent 00d11a7ba0
commit 01b340dee1
6 changed files with 111 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/Widgets/ComboBox.cpp
+12 -25
View File
@@ -302,25 +302,10 @@ void ComboBox::ForceDropdownOpen()
}
}
void ComboBox::RefreshDropdownIfOpen()
void ComboBox::CloseDropdown()
{
if (!drop_down)
return;
drop.hover_item = -1;
drop.offset = wxPoint();
if (drop.subDropDown) {
drop.subDropDown->group.clear();
drop.subDropDown->hover_item = -1;
drop.subDropDown->offset = wxPoint();
if (drop.subDropDown->IsShown())
drop.subDropDown->Dismiss();
}
drop.need_sync = true;
drop.messureSize();
drop.autoPosition();
drop.paintNow();
if (drop.IsShown())
drop.DismissAndNotify();
}
unsigned int ComboBox::GetCount() const { return items.size(); }
@@ -452,16 +437,18 @@ void ComboBox::keyDown(wxKeyEvent& event)
case WXK_UP:
case WXK_DOWN:
case WXK_LEFT:
case WXK_RIGHT:
if ((event.GetKeyCode() == WXK_UP || event.GetKeyCode() == WXK_LEFT) && GetSelection() > 0) {
SetSelection(GetSelection() - 1);
} else if ((event.GetKeyCode() == WXK_DOWN || event.GetKeyCode() == WXK_RIGHT) && GetSelection() + 1 < items.size()) {
SetSelection(GetSelection() + 1);
} else {
case WXK_RIGHT: {
// Step over disabled rows: the mouse cannot select them either.
const int step = (event.GetKeyCode() == WXK_UP || event.GetKeyCode() == WXK_LEFT) ? -1 : 1;
int n = GetSelection() + step;
while (n >= 0 && n < int(items.size()) && (items[n].style & DD_ITEM_STYLE_DISABLED))
n += step;
if (n < 0 || n >= int(items.size()))
break;
}
SetSelection(n);
sendComboBoxEvent();
break;
}
case WXK_TAB:
HandleAsNavigationKey(event);
break;