3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Implemented OnMouseMove and OnMouseClick for PopupSearchList

Browse source
This commit is contained in:
YuSanka 2020-04-07 19:09:33 +02:00
parent cd13356b6d
commit dcdafb6208
2 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/slic3r/GUI/Search.cpp
View file

@ -482,8 +482,8 @@ SearchCtrl::SearchCtrl(wxWindow* parent)
box_sizer->Add(comboCtrl, 0, wxALIGN_CENTER_VERTICAL);
popupListBox->Bind(wxEVT_LISTBOX, &SearchCtrl::OnSelect, this);
popupListBox->Bind(wxEVT_LEFT_DOWN, &SearchCtrl::OnLeftDownInPopup, this);
// popupListBox->Bind(wxEVT_LEFT_DOWN, &SearchCtrl::OnLeftDownInPopup, this);
popupListBox->Bind(wxEVT_LISTBOX, &SearchCtrl::OnSelect, this);
comboCtrl->Bind(wxEVT_TEXT, &SearchCtrl::OnInputText, this);
comboCtrl->Bind(wxEVT_TEXT_ENTER, &SearchCtrl::PopupList, this);
@ -559,18 +559,21 @@ void SearchCtrl::msw_rescale()
comboCtrl->SetButtonBitmaps(create_scaled_bitmap("search"));
}
void SearchCtrl::select(int selection)
{
if (selection < 0)
return;
prevent_update = true;
wxGetApp().sidebar().jump_to_option(selection);
prevent_update = false;
// comboCtrl->Dismiss();
}
void SearchCtrl::OnSelect(wxCommandEvent& event)
{
prevent_update = true;
int selection = event.GetSelection();
if (selection >= 0)
wxGetApp().sidebar().jump_to_option(selection);
prevent_update = false;
comboCtrl->Dismiss();
select(event.GetSelection());
}
void SearchCtrl::update_list(std::vector<SearchOptions::Filter>& filters)
@ -596,7 +599,7 @@ void SearchCtrl::OnLeftUpInTextCtrl(wxEvent &event)
void SearchCtrl::OnLeftDownInPopup(wxEvent &event)
{
wxPoint pt = wxGetMousePosition() - popupListBox->GetScreenPosition();
int selected_item = popupListBox->HitTest(pt);
select(popupListBox->HitTest(pt));
event.Skip();
}