smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

prepare fade+trim cursors (cursor image still missing)

Browse source
This commit is contained in:
Robin Gareus 2014-05-31 14:04:41 +02:00
parent f0536816ab
commit d6b1a9f6e3
3 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gtk2_ardour/editor_mouse.cc
View file

@ -2011,7 +2011,6 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
}
break;
case FadeInTrimHandleItem:
case FadeInHandleItem:
if (mouse_mode == MouseObject && !internal_editing()) {
ArdourCanvas::Rectangle *rect = dynamic_cast<ArdourCanvas::Rectangle *> (item);
@ -2023,7 +2022,17 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
}
break;
case FadeOutTrimHandleItem:
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);
@ -2034,6 +2043,18 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
}
}
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);
}
}
break;
case FeatureLineItem:
{
ArdourCanvas::Line *line = dynamic_cast<ArdourCanvas::Line *> (item);

10
gtk2_ardour/mouse_cursors.cc
View file

@ -114,6 +114,16 @@ 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,6 +38,8 @@ 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;