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

Workarounds for selection under OSX and GTK

Browse source
This commit is contained in:
YuSanka 2019-06-13 13:00:46 +02:00
parent c9dd5f8786
commit e00774d2e2
1 changed files with 25 additions and 2 deletions

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

@ -42,8 +42,19 @@ ObjectLayers::ObjectLayers(wxWindow* parent) :
void ObjectLayers::select_editor(LayerRangeEditor* editor, const bool is_last_edited_range) void ObjectLayers::select_editor(LayerRangeEditor* editor, const bool is_last_edited_range)
{ {
if (is_last_edited_range && m_selection_type == editor->type()) { if (is_last_edited_range && m_selection_type == editor->type()) {
/* Workaround! Under OSX we should use CallAfter() for SetFocus() after LayerEditors "reorganizations",
* because of selected control's strange behavior:
* cursor is set to the control, but blue border - doesn't.
* And as a result we couldn't edit this control.
* */
#ifdef __WXOSX__
wxTheApp->CallAfter([editor]() {
#endif
editor->SetFocus(); editor->SetFocus();
editor->SetInsertionPointEnd(); editor->SetInsertionPointEnd();
#ifdef __WXOSX__
});
#endif
} }
} }
@ -239,11 +250,15 @@ LayerRangeEditor::LayerRangeEditor( wxWindow* parent,
this->Bind(wxEVT_KILL_FOCUS, [this, edit_fn](wxFocusEvent& e) this->Bind(wxEVT_KILL_FOCUS, [this, edit_fn](wxFocusEvent& e)
{ {
if (!m_enter_pressed) { if (!m_enter_pressed) {
// update data for next editor selection #ifndef __WXGTK__
/* Update data for next editor selection.
* But under GTK it lucks like there is no information about selected control at e.GetWindow(),
* 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());
if (new_editor) if (new_editor)
new_editor->set_focus(); new_editor->set_focus();
#endif // not __WXGTK__
// If LayersList wasn't updated/recreated, we should call e.Skip() // If LayersList wasn't updated/recreated, we should call e.Skip()
if (m_type & etLayerHeight) { if (m_type & etLayerHeight) {
if (!edit_fn(get_value(), false)) if (!edit_fn(get_value(), false))
@ -263,6 +278,14 @@ LayerRangeEditor::LayerRangeEditor( wxWindow* parent,
} }
}, this->GetId()); }, this->GetId());
#ifdef __WXGTK__ // Workaround! To take information about selectable range
this->Bind(wxEVT_LEFT_DOWN, [this](wxEvent& e)
{
set_focus();
e.Skip();
}, this->GetId());
#endif //__WXGTK__
this->Bind(wxEVT_CHAR, ([this](wxKeyEvent& event) this->Bind(wxEVT_CHAR, ([this](wxKeyEvent& event)
{ {
// select all text using Ctrl+A // select all text using Ctrl+A