summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-11-14 21:55:11 +0000
committerCarl Hetherington <carl@carlh.net>2010-11-14 21:55:11 +0000
commit3b7302ecd4ccab57e43082372074a87e686e8ca4 (patch)
tree77f1a9bc11d27ab97a7274519efdd51fee9eb0c1 /gtk2_ardour
parenta4e61456480fdf975ea52ea69d7d9671730616b7 (diff)
Fix up fade in/out cursors.
git-svn-id: svn://localhost/ardour2/branches/3.0@8034 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor.cc4
-rw-r--r--gtk2_ardour/editor_mouse.cc4
-rw-r--r--gtk2_ardour/icons/fade_in_cursor.pngbin1261 -> 1116 bytes
-rw-r--r--gtk2_ardour/icons/fade_in_cursor_4.pngbin1116 -> 0 bytes
-rw-r--r--gtk2_ardour/icons/fade_out_cursor.pngbin1250 -> 1116 bytes
-rw-r--r--gtk2_ardour/icons/fade_out_cursor_4.pngbin1116 -> 0 bytes
6 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 82bb84097d..8512200b07 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1301,12 +1301,12 @@ Editor::build_cursors ()
{
Glib::RefPtr<Gdk::Pixbuf> apixbuf (::get_icon ("fade_in_cursor"));
- fade_in_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 0, 40);
+ fade_in_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 0, 0);
}
{
Glib::RefPtr<Gdk::Pixbuf> apixbuf (::get_icon ("fade_out_cursor"));
- fade_out_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 27, 40);
+ fade_out_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 29, 0);
}
selector_cursor = new Gdk::Cursor (XTERM);
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 98aa429f5b..a056b2dddc 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -776,14 +776,14 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
case FadeInHandleItem:
{
RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
- _drags->set (new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event);
+ _drags->set (new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event, fade_in_cursor);
return true;
}
case FadeOutHandleItem:
{
RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
- _drags->set (new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event);
+ _drags->set (new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event, fade_out_cursor);
return true;
}
diff --git a/gtk2_ardour/icons/fade_in_cursor.png b/gtk2_ardour/icons/fade_in_cursor.png
index d57a76eccf..5428760917 100644
--- a/gtk2_ardour/icons/fade_in_cursor.png
+++ b/gtk2_ardour/icons/fade_in_cursor.png
Binary files differ
diff --git a/gtk2_ardour/icons/fade_in_cursor_4.png b/gtk2_ardour/icons/fade_in_cursor_4.png
deleted file mode 100644
index 5428760917..0000000000
--- a/gtk2_ardour/icons/fade_in_cursor_4.png
+++ /dev/null
Binary files differ
diff --git a/gtk2_ardour/icons/fade_out_cursor.png b/gtk2_ardour/icons/fade_out_cursor.png
index fc7f48aa97..5c77ec6560 100644
--- a/gtk2_ardour/icons/fade_out_cursor.png
+++ b/gtk2_ardour/icons/fade_out_cursor.png
Binary files differ
diff --git a/gtk2_ardour/icons/fade_out_cursor_4.png b/gtk2_ardour/icons/fade_out_cursor_4.png
deleted file mode 100644
index 5c77ec6560..0000000000
--- a/gtk2_ardour/icons/fade_out_cursor_4.png
+++ /dev/null
Binary files differ