GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-14 01:25:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev

Browse Source
This commit is contained in:
bubnikv 2019-09-19 17:16:43 +02:00
commit 110d5b9d56
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/GUI_ObjectLayers.cpp
View File

@ -284,6 +284,9 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* parent,
wxSize(8 * em_unit(parent->m_parent), wxDefaultCoord), wxTE_PROCESS_ENTER) wxSize(8 * em_unit(parent->m_parent), wxDefaultCoord), wxTE_PROCESS_ENTER)
{ {
this->SetFont(wxGetApp().normal_font()); this->SetFont(wxGetApp().normal_font());
// Reset m_enter_pressed flag to _false_, when value is editing
this->Bind(wxEVT_TEXT, [this](wxEvent&) { m_enter_pressed = false; }, this->GetId());
this->Bind(wxEVT_TEXT_ENTER, [this, edit_fn](wxEvent&) this->Bind(wxEVT_TEXT_ENTER, [this, edit_fn](wxEvent&)
{ {
@ -307,7 +310,7 @@ LayerRangeEditor::LayerRangeEditor( ObjectLayers* parent,
if (!m_enter_pressed) { if (!m_enter_pressed) {
#ifndef __WXGTK__ #ifndef __WXGTK__
/* Update data for next editor selection. /* Update data for next editor selection.
* But under GTK it lucks like there is no information about selected control at e.GetWindow(), * But under GTK it looks like there is no information about selected control at e.GetWindow(),
* so we'll take it from wxEVT_LEFT_DOWN event * so we'll take it from wxEVT_LEFT_DOWN event
* */ * */
LayerRangeEditor* new_editor = dynamic_cast<LayerRangeEditor*>(e.GetWindow()); LayerRangeEditor* new_editor = dynamic_cast<LayerRangeEditor*>(e.GetWindow());