GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 02:11:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SearchDialog: Fixed hide of the dialog, when some item in list is selected

Browse Source
This commit is contained in:
YuSanka 2024-07-19 16:22:38 +02:00 committed by Lukas Matena
parent 795c3a7dd6
commit b15344d783
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,6 +455,12 @@ void OptionsSearcher::update_dialog_position()
void OptionsSearcher::check_and_hide_dialog() void OptionsSearcher::check_and_hide_dialog()
{ {
#ifdef __linux__
// Temporary linux specific workaround:
// has_focus(search_dialog) always returns false
// That's why search dialog will be hidden whole the time
return;
#endif
if (search_dialog && search_dialog->IsShown() && !has_focus(search_dialog)) if (search_dialog && search_dialog->IsShown() && !has_focus(search_dialog))
show_dialog(false); show_dialog(false);
} }
@ -468,7 +474,7 @@ void OptionsSearcher::set_focus_to_parent()
void OptionsSearcher::show_dialog(bool show /*= true*/) void OptionsSearcher::show_dialog(bool show /*= true*/)
{ {
if (search_dialog && !show) { if (search_dialog && !show) {
search_dialog->EndModal(wxID_CLOSE); search_dialog->Hide();
return; return;
} }
@ -522,9 +528,13 @@ void OptionsSearcher::process_key_down_from_input(wxKeyEvent& e)
{ {
int key = e.GetKeyCode(); int key = e.GetKeyCode();
if (key == WXK_ESCAPE) if (key == WXK_ESCAPE)
search_dialog->EndModal(wxID_CLOSE); search_dialog->Hide();
else if (search_dialog && (key == WXK_UP || key == WXK_DOWN || key == WXK_NUMPAD_ENTER || key == WXK_RETURN)) else if (search_dialog && (key == WXK_UP || key == WXK_DOWN || key == WXK_NUMPAD_ENTER || key == WXK_RETURN)) {
search_dialog->KeyDown(e); search_dialog->KeyDown(e);
#ifdef __linux__
search_dialog->SetFocus();
#endif // __linux__
}
} }
void OptionsSearcher::set_search_input(TextInput* input_ctrl) void OptionsSearcher::set_search_input(TextInput* input_ctrl)
@ -667,7 +677,7 @@ void SearchDialog::ProcessSelection(wxDataViewItem selection)
{ {
if (!selection.IsOk()) if (!selection.IsOk())
return; return;
this->EndModal(wxID_CLOSE); this->Hide();
// If call GUI::wxGetApp().sidebar.jump_to_option() directly from here, // If call GUI::wxGetApp().sidebar.jump_to_option() directly from here,
// then mainframe will not have focus and found option will not be "active" (have cursor) as a result // then mainframe will not have focus and found option will not be "active" (have cursor) as a result

2
src/slic3r/GUI/TopBar.hpp
View File

@ -2,7 +2,7 @@
#define slic3r_TopBar_hpp_ #define slic3r_TopBar_hpp_
#include <wx/bookctrl.h> #include <wx/bookctrl.h>
#include "wxExtensions.hpp" #include <wx/panel.h>
#include "Widgets/TextInput.hpp" #include "Widgets/TextInput.hpp"
class TopBarMenus; class TopBarMenus;