3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suppress to show Search window on the Plater using Ctrl+F shortcut, when we are at Preview mode

Browse Source
This commit is contained in:
YuSanka 2021-03-24 11:31:50 +01:00
parent 4496e2a8ce
commit 8bc23c90fc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/MainFrame.cpp
View File

@ -1151,7 +1151,7 @@ void MainFrame::init_menubar_as_editor()
editMenu->AppendSeparator(); editMenu->AppendSeparator();
append_menu_item(editMenu, wxID_ANY, _L("Searc&h") + "\tCtrl+F", append_menu_item(editMenu, wxID_ANY, _L("Searc&h") + "\tCtrl+F",
_L("Search in settings"), [this](wxCommandEvent&) { m_plater->search(/*m_tabpanel->GetCurrentPage() == */m_plater->IsShown()); }, _L("Search in settings"), [this](wxCommandEvent&) { m_plater->search(m_plater->IsShown()); },
"search", nullptr, []() {return true; }, this); "search", nullptr, []() {return true; }, this);
} }

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

@ -5858,6 +5858,8 @@ void Plater::paste_from_clipboard()
void Plater::search(bool plater_is_active) void Plater::search(bool plater_is_active)
{ {
if (plater_is_active) { if (plater_is_active) {
if (is_preview_shown())
return;
// plater should be focused for correct navigation inside search window // plater should be focused for correct navigation inside search window
this->SetFocus(); this->SetFocus();