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

Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models

Browse Source
This commit is contained in:
Enrico Turri 2019-02-20 08:25:34 +01:00
commit 4a9f6ba06a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3131,15 +3131,17 @@ void Plater::on_config_change(const DynamicPrintConfig &config)
void Plater::on_activate() void Plater::on_activate()
{ {
#ifdef __linux__
wxWindow *focus_window = wxWindow::FindFocus(); wxWindow *focus_window = wxWindow::FindFocus();
if (focus_window == nullptr) { // Activating the main frame, and no window has keyboard focus.
// Activating the main frame, and no window has keyboard focus. // Set the keyboard focus to the visible Canvas3D.
// Set the keyboard focus to the visible Canvas3D. if (this->p->view3D->IsShown() && (!focus_window || focus_window == this->p->view3D->get_wxglcanvas()))
if (this->p->view3D->IsShown()) this->p->view3D->get_wxglcanvas()->SetFocus();
this->p->view3D->get_wxglcanvas()->SetFocus();
else if (this->p->preview->IsShown()) else if (this->p->preview->IsShown() && (!focus_window || focus_window == this->p->view3D->get_wxglcanvas()))
this->p->preview->get_wxglcanvas()->SetFocus(); this->p->preview->get_wxglcanvas()->SetFocus();
} #endif
if (! this->p->delayed_error_message.empty()) { if (! this->p->delayed_error_message.empty()) {
std::string msg = std::move(this->p->delayed_error_message); std::string msg = std::move(this->p->delayed_error_message);
this->p->delayed_error_message.clear(); this->p->delayed_error_message.clear();