ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

unify Fade-Handle Cursors

This commit is contained in:
Robin Gareus 2014-06-05 18:57:45 +02:00
parent 4ad24b3a27
commit 2aa32ed349
3 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/editor_mouse.cc
View File

@ -1999,6 +1999,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
break;
case FadeInHandleItem:
case FadeInTrimHandleItem:
if (mouse_mode == MouseObject && !internal_editing()) {
ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
if (rect) {
@ -2009,35 +2010,14 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
}
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);
}
}
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;

10
gtk2_ardour/mouse_cursors.cc
View File

@ -114,16 +114,6 @@ MouseCursors::MouseCursors ()
fade_out = new Cursor (Display::get_default(), p, 29, 0);
}
{
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);

2
gtk2_ardour/mouse_cursors.h
View File

@ -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;