diff options
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 24 | ||||
| -rw-r--r-- | gtk2_ardour/mouse_cursors.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/mouse_cursors.h | 2 |
3 files changed, 2 insertions, 34 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 935c90272d..7be17e74e7 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1999,45 +1999,25 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; case FadeInHandleItem: - if (mouse_mode == MouseObject && !internal_editing()) { - ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item); - if (rect) { - RegionView* rv = static_cast<RegionView*>(item->get_data ("regionview")); - rect->set_fill_color (rv->get_fill_color()); - set_canvas_cursor (_cursors->fade_in); - } - } - break; - case FadeInTrimHandleItem: if (mouse_mode == MouseObject && !internal_editing()) { ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item); if (rect) { RegionView* rv = static_cast<RegionView*>(item->get_data ("regionview")); rect->set_fill_color (rv->get_fill_color()); - set_canvas_cursor (_cursors->fade_trim_in); + set_canvas_cursor (_cursors->fade_in); } } break; case FadeOutHandleItem: - if (mouse_mode == MouseObject && !internal_editing()) { - ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item); - if (rect) { - RegionView* rv = static_cast<RegionView*>(item->get_data ("regionview")); - rect->set_fill_color (rv->get_fill_color ()); - set_canvas_cursor (_cursors->fade_out); - } - } - break; - case FadeOutTrimHandleItem: if (mouse_mode == MouseObject && !internal_editing()) { ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item); if (rect) { RegionView* rv = static_cast<RegionView*>(item->get_data ("regionview")); rect->set_fill_color (rv->get_fill_color ()); - set_canvas_cursor (_cursors->fade_trim_out); + set_canvas_cursor (_cursors->fade_out); } } break; diff --git a/gtk2_ardour/mouse_cursors.cc b/gtk2_ardour/mouse_cursors.cc index 9ccaf4de43..98e33d77d6 100644 --- a/gtk2_ardour/mouse_cursors.cc +++ b/gtk2_ardour/mouse_cursors.cc @@ -115,16 +115,6 @@ MouseCursors::MouseCursors () } { - RefPtr<Pixbuf> p (::get_icon ("fade_in_cursor")); - fade_trim_in = new Cursor (Display::get_default(), p, 0, 0); - } - - { - RefPtr<Pixbuf> p (::get_icon ("fade_out_cursor")); - fade_trim_out = new Cursor (Display::get_default(), p, 29, 0); - } - - { RefPtr<Pixbuf> p (::get_icon ("resize_left_cursor")); resize_left = new Cursor (Display::get_default(), p, 3, 10); } diff --git a/gtk2_ardour/mouse_cursors.h b/gtk2_ardour/mouse_cursors.h index 414ec3bae6..bf93e1ad78 100644 --- a/gtk2_ardour/mouse_cursors.h +++ b/gtk2_ardour/mouse_cursors.h @@ -38,8 +38,6 @@ public: Gdk::Cursor* left_side_trim_right_only; Gdk::Cursor* fade_in; Gdk::Cursor* fade_out; - Gdk::Cursor* fade_trim_in; - Gdk::Cursor* fade_trim_out; Gdk::Cursor* selector; Gdk::Cursor* grabber; Gdk::Cursor* grabber_note; |