Revert "frankenstein'ed fade+trim cursors"

[ardour.git] / gtk2_ardour / mouse_cursors.cc

diff --git a/gtk2_ardour/mouse_cursors.cc b/gtk2_ardour/mouse_cursors.cc
index fa3ce331d660bcd28d272c6f4f2a86a5d6755951..9ccaf4de434b2cd59081c1204c285da23e5261b4 100644 (file)
--- a/gtk2_ardour/mouse_cursors.cc
+++ b/gtk2_ardour/mouse_cursors.cc
@@ -29,7 +29,7 @@ MouseCursors::MouseCursors ()
 
        {
                RefPtr<Pixbuf> p (::get_icon ("zoom_in_cursor"));
-               zoom_in = new Cursor (Display::get_default(), p, 5, 5);
+               zoom_in = new Cursor (Display::get_default(), p, 10, 5);
        }
 
        {
@@ -49,7 +49,7 @@ MouseCursors::MouseCursors ()
        {
                RefPtr<Bitmap> source = Bitmap::create ((char const *) speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
                RefPtr<Bitmap> mask = Bitmap::create ((char const *) speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
-               speaker = new Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
+               speaker = new Cursor (source, mask, ffg, fbg, speaker_cursor_width >> 1, speaker_cursor_height >> 1);
        }
 
        {
@@ -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);