Navigation keys work again, fixed a segfault when showing the navigator window

This commit is contained in:
Matthias Koefferlein 2022-05-09 23:07:40 +02:00
parent 008fb06a3e
commit fbc31fd854
2 changed files with 22 additions and 9 deletions

View File

@ -170,6 +170,20 @@ LayoutView::init_ui ()
m_always_show_ld = true;
m_always_show_layout_index = false;
mp_timer = 0;
mp_left_frame = 0;
mp_control_panel = 0;
mp_hierarchy_panel = 0;
mp_libraries_view = 0;
mp_bookmarks_view = 0;
mp_control_frame = 0;
mp_hierarchy_frame = 0;
mp_libraries_frame = 0;
mp_bookmarks_frame = 0;
mp_editor_options_frame = 0;
mp_min_hier_spbx = 0;
mp_max_hier_spbx = 0;
QVBoxLayout *vbl = new QVBoxLayout (this);
vbl->setContentsMargins (0, 0, 0, 0);
vbl->setSpacing (0);

View File

@ -396,15 +396,6 @@ LayoutViewBase::init (db::Manager *mgr)
mp_canvas = new lay::LayoutCanvas (this);
#endif
mp_canvas->left_arrow_key_pressed.add (this, &LayoutViewBase::pan_left);
mp_canvas->up_arrow_key_pressed.add (this, &LayoutViewBase::pan_up);
mp_canvas->right_arrow_key_pressed.add (this, &LayoutViewBase::pan_right);
mp_canvas->down_arrow_key_pressed.add (this, &LayoutViewBase::pan_down);
mp_canvas->left_arrow_key_pressed_with_shift.add (this, &LayoutViewBase::pan_left_fast);
mp_canvas->up_arrow_key_pressed_with_shift.add (this, &LayoutViewBase::pan_up_fast);
mp_canvas->right_arrow_key_pressed_with_shift.add (this, &LayoutViewBase::pan_right_fast);
mp_canvas->down_arrow_key_pressed_with_shift.add (this, &LayoutViewBase::pan_down_fast);
// occupy services and editables:
// these services get deleted by the canvas destructor automatically:
if ((m_options & LV_NoTracker) == 0) {
@ -511,6 +502,14 @@ void LayoutViewBase::update_event_handlers ()
annotation_shapes ().bboxes_changed_any_event.add (this, &LayoutViewBase::signal_annotations_changed);
mp_canvas->viewport_changed_event.add (this, &LayoutViewBase::viewport_changed);
mp_canvas->left_arrow_key_pressed.add (this, &LayoutViewBase::pan_left);
mp_canvas->up_arrow_key_pressed.add (this, &LayoutViewBase::pan_up);
mp_canvas->right_arrow_key_pressed.add (this, &LayoutViewBase::pan_right);
mp_canvas->down_arrow_key_pressed.add (this, &LayoutViewBase::pan_down);
mp_canvas->left_arrow_key_pressed_with_shift.add (this, &LayoutViewBase::pan_left_fast);
mp_canvas->up_arrow_key_pressed_with_shift.add (this, &LayoutViewBase::pan_up_fast);
mp_canvas->right_arrow_key_pressed_with_shift.add (this, &LayoutViewBase::pan_right_fast);
mp_canvas->down_arrow_key_pressed_with_shift.add (this, &LayoutViewBase::pan_down_fast);
}
void LayoutViewBase::viewport_changed ()