summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-11-14 22:03:57 +0000
committerCarl Hetherington <carl@carlh.net>2010-11-14 22:03:57 +0000
commitba649118f2b2142a592c6b8592c479f328c4babf (patch)
tree152d564a05fdcd474f80db9e0ddc1fc890586fb2 /gtk2_ardour
parentfc142a3fe630e785f39ba411a8943b05a5dc410d (diff)
Use a couple more cursors in the summary.
git-svn-id: svn://localhost/ardour2/branches/3.0@8036 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor.cc12
-rw-r--r--gtk2_ardour/editor.h2
-rw-r--r--gtk2_ardour/editor_summary.cc8
3 files changed, 21 insertions, 1 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 568afc0e35..27cd0421a4 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -241,6 +241,8 @@ 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;
+Gdk::Cursor* Editor::expand_left_right_cursor = 0;
+Gdk::Cursor* Editor::expand_up_down_cursor = 0;
void
show_me_the_size (Requisition* r, const char* what)
@@ -1363,6 +1365,16 @@ Editor::build_cursors ()
move_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 11, 11);
}
+ {
+ Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("expand_left_right_cursor"));
+ expand_left_right_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 11, 4);
+ }
+
+ {
+ Glib::RefPtr<Gdk::Pixbuf> p (::get_icon ("expand_up_down_cursor"));
+ expand_up_down_cursor = new Gdk::Cursor (Gdk::Display::get_default(), p, 4, 11);
+ }
+
selector_cursor = new Gdk::Cursor (XTERM);
time_fx_cursor = new Gdk::Cursor (SIZING);
wait_cursor = new Gdk::Cursor (WATCH);
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index a528b76954..a8c5fa3db5 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -484,6 +484,8 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
static Gdk::Cursor* resize_bottom_cursor;
static Gdk::Cursor* resize_bottom_left_cursor;
static Gdk::Cursor* move_cursor;
+ static Gdk::Cursor* expand_left_right_cursor;
+ static Gdk::Cursor* expand_up_down_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 5b0902a2f6..dc25824a02 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -438,6 +438,12 @@ EditorSummary::set_cursor (Position p)
case INSIDE:
get_window()->set_cursor (*_editor->move_cursor);
break;
+ case TO_LEFT_OR_RIGHT:
+ get_window()->set_cursor (*_editor->expand_left_right_cursor);
+ break;
+ case BELOW_OR_ABOVE:
+ get_window()->set_cursor (*_editor->expand_up_down_cursor);
+ break;
default:
get_window()->set_cursor ();
break;
@@ -476,7 +482,7 @@ EditorSummary::on_motion_notify_event (GdkEventMotion* ev)
}
set_editor (xr, y);
- set_cursor (INSIDE);
+ set_cursor (_start_position);
} else if (_zoom_dragging) {