diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-08-27 02:01:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-08-27 02:01:59 +0000 |
| commit | ba6cc76ec026c5626dd545966677a467ac341b73 (patch) | |
| tree | 8513d3481fce4d2461e2c3e14918242f1abc42e8 | |
| parent | 2b28b268c06ac79fe27c2ac2b5895a0bc129f624 (diff) | |
Remove what I'm pretty sure was a hack to work around the bug we used to have with the mouse entering and leaving the verbose canvas cursor. Fixes #3415.
git-svn-id: svn://localhost/ardour2/branches/3.0@7699 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor.h | 10 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 10 |
3 files changed, 4 insertions, 17 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index b153967cd3..47743773f7 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -352,7 +352,6 @@ Editor::Editor () show_gain_after_trim = false; verbose_cursor_on = true; last_item_entered = 0; - last_item_entered_n = 0; have_pending_keyboard_selection = false; _follow_playhead = true; diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 3f9dc6d880..65395920f1 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1359,14 +1359,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD bool canvas_fade_in_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); bool canvas_fade_out_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); bool canvas_fade_out_handle_event (GdkEvent* event,ArdourCanvas::Item*, AudioRegionView*); - - - // These variables are used to detect a feedback loop and break it to avoid a gui hang -private: - ArdourCanvas::Item *last_item_entered; - int last_item_entered_n; - -public: bool canvas_region_view_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_frame_handle_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); bool canvas_region_view_name_highlight_event (GdkEvent* event,ArdourCanvas::Item*, RegionView*); @@ -1401,6 +1393,8 @@ public: friend class EditorRouteGroups; friend class EditorRegions; + ArdourCanvas::Item *last_item_entered; + /* non-public event handlers */ bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 0346ca11ef..45bd2903d8 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1471,10 +1471,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ double fraction; bool ret = true; - if (last_item_entered != item) { - last_item_entered = item; - last_item_entered_n = 0; - } + last_item_entered = item; switch (item_type) { case ControlPointItem: @@ -1495,11 +1492,8 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ track_canvas->get_window()->set_cursor (*fader_cursor); } - last_item_entered_n++; set_verbose_canvas_cursor (cp->line().get_verbose_cursor_string (fraction), at_x, at_y); - if (last_item_entered_n < 10) { - show_verbose_canvas_cursor (); - } + show_verbose_canvas_cursor (); } break; |