Fix up summary mouse cursors.

git-svn-id: svn://localhost/ardour2/branches/3.0@8035 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8512200b076ce14dd8b07a23044494eede726dee..568afc0e35330b605f884c80d1f701b511db8a4a 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -232,6 +232,15 @@ Gdk::Cursor* Editor::wait_cursor = 0;
 Gdk::Cursor* Editor::timebar_cursor = 0;
 Gdk::Cursor* Editor::transparent_cursor = 0;
 Gdk::Cursor* Editor::up_down_cursor = 0;
+Gdk::Cursor* Editor::resize_left_cursor = 0;
+Gdk::Cursor* Editor::resize_top_left_cursor = 0;
+Gdk::Cursor* Editor::resize_top_cursor = 0;
+Gdk::Cursor* Editor::resize_top_right_cursor = 0;
+Gdk::Cursor* Editor::resize_right_cursor = 0;
+Gdk::Cursor* Editor::resize_bottom_right_cursor = 0;
+Gdk::Cursor* Editor::resize_bottom_cursor = 0;
+Gdk::Cursor* Editor::resize_bottom_left_cursor = 0;
+Gdk::Cursor* Editor::move_cursor = 0;
 
 void
 show_me_the_size (Requisition* r, const char* what)
@@ -1309,9 +1318,54 @@ Editor::build_cursors ()
                fade_out_cursor = new Gdk::Cursor (Gdk::Display::get_default(), apixbuf, 29, 0);
        }
 
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("resize_left_cursor"));
+               resize_left_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 3, 10);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("resize_top_left_cursor"));
+               resize_top_left_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 3, 18);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("resize_top_cursor"));
+               resize_top_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 10, 24);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("resize_top_right_cursor"));
+               resize_top_right_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 18, 18);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("resize_right_cursor"));
+               resize_right_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 24, 10);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("resize_bottom_right_cursor"));
+               resize_bottom_right_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 18, 3);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("resize_bottom_cursor"));
+               resize_bottom_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 10, 3);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("resize_bottom_left_cursor"));
+               resize_bottom_left_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 3, 3);
+       }
+
+       {
+               Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("move_cursor"));
+               move_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 11, 11);
+       }
+
        selector_cursor = new Gdk::Cursor (XTERM);
        time_fx_cursor = new Gdk::Cursor (SIZING);
-       wait_cursor = new Gdk::Cursor  (WATCH);
+       wait_cursor = new Gdk::Cursor (WATCH);
        timebar_cursor = new Gdk::Cursor(LEFT_PTR);
        midi_pencil_cursor = new Gdk::Cursor (PENCIL);
        midi_select_cursor = new Gdk::Cursor (CENTER_PTR);

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 6bf362739fbd63350c26026d0a5149d1474a3efd..a528b76954675637d3667c307a0097123cbba7a6 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -475,6 +475,15 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
        static Gdk::Cursor* wait_cursor;
        static Gdk::Cursor* timebar_cursor;
        static Gdk::Cursor* transparent_cursor;
+       static Gdk::Cursor* resize_left_cursor;
+       static Gdk::Cursor* resize_top_left_cursor;
+       static Gdk::Cursor* resize_top_cursor;
+       static Gdk::Cursor* resize_top_right_cursor;
+       static Gdk::Cursor* resize_right_cursor;
+       static Gdk::Cursor* resize_bottom_right_cursor;
+       static Gdk::Cursor* resize_bottom_cursor;
+       static Gdk::Cursor* resize_bottom_left_cursor;
+       static Gdk::Cursor* move_cursor;
 
         Gdk::Cursor* get_canvas_cursor () const { return current_canvas_cursor; }
         void set_canvas_cursor (Gdk::Cursor*, bool save=false);

diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index 423b137cd8e4b6920e95ec956c958880144a0ad7..5b0902a2f6a59c80ab7acc98d191572020dd7244 100644 (file)
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -412,31 +412,31 @@ EditorSummary::set_cursor (Position p)
 {
        switch (p) {
        case LEFT:
-               get_window()->set_cursor (*_editor->left_side_trim_cursor);
+               get_window()->set_cursor (*_editor->resize_left_cursor);
                break;
        case LEFT_TOP:
-               get_window()->set_cursor (Gdk::Cursor (Gdk::TOP_LEFT_CORNER));
+               get_window()->set_cursor (*_editor->resize_top_left_cursor);
                break;
        case TOP:
-               get_window()->set_cursor (Gdk::Cursor (Gdk::TOP_SIDE));
+               get_window()->set_cursor (*_editor->resize_top_cursor);
                break;
        case RIGHT_TOP:
-               get_window()->set_cursor (Gdk::Cursor (Gdk::TOP_RIGHT_CORNER));
+               get_window()->set_cursor (*_editor->resize_top_right_cursor);
                break;
        case RIGHT:
-               get_window()->set_cursor (*_editor->right_side_trim_cursor);
+               get_window()->set_cursor (*_editor->resize_right_cursor);
                break;
        case RIGHT_BOTTOM:
-               get_window()->set_cursor (Gdk::Cursor (Gdk::BOTTOM_RIGHT_CORNER));
+               get_window()->set_cursor (*_editor->resize_bottom_right_cursor);
                break;
        case BOTTOM:
-               get_window()->set_cursor (Gdk::Cursor (Gdk::BOTTOM_SIDE));
+               get_window()->set_cursor (*_editor->resize_bottom_cursor);
                break;
        case LEFT_BOTTOM:
-               get_window()->set_cursor (Gdk::Cursor (Gdk::BOTTOM_LEFT_CORNER));
+               get_window()->set_cursor (*_editor->resize_bottom_left_cursor);
                break;
        case INSIDE:
-               get_window()->set_cursor (Gdk::Cursor (Gdk::FLEUR));
+               get_window()->set_cursor (*_editor->move_cursor);
                break;
        default:
                get_window()->set_cursor ();