diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-10 15:25:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-10 15:25:01 +0000 |
| commit | 6449c2e5c8b027245fe5fb9942984243e4a653d7 (patch) | |
| tree | 0441b7521bc04dec2f858c3ca836d1ce43b1dcb9 /gtk2_ardour/editor_mouse.cc | |
| parent | dbafe45a280cc6c33bb7dca72202c109012cd8eb (diff) | |
more ardour-button-ization; fix transparency of selection rects; use "correct" cursors when entering and leaving selection rect handles; color tweaks for a few buttons
git-svn-id: svn://localhost/ardour2/branches/3.0@10527 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_mouse.cc')
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 1ddf026af7..6419591716 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1655,17 +1655,21 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ break; case StartSelectionTrimItem: - case EndSelectionTrimItem: - #ifdef WITH_CMT case ImageFrameHandleStartItem: - case ImageFrameHandleEndItem: case MarkerViewHandleStartItem: +#endif + if (is_drawable()) { + set_canvas_cursor (_cursors->left_side_trim); + } + break; + case EndSelectionTrimItem: +#ifdef WITH_CMT + case ImageFrameHandleEndItem: case MarkerViewHandleEndItem: #endif - if (is_drawable()) { - set_canvas_cursor (_cursors->trimmer); + set_canvas_cursor (_cursors->right_side_trim); } break; @@ -2549,8 +2553,7 @@ Editor::set_internal_edit (bool yn) _internal_editing = yn; if (yn) { - mouse_select_button.set_image (*(manage (new Image (::get_icon("midi_tool_pencil"))))); - mouse_select_button.get_image ()->show (); + mouse_select_button.set_image (::get_icon("midi_tool_pencil")); ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Draw/Edit MIDI Notes")); mouse_mode_toggled (mouse_mode); @@ -2562,8 +2565,7 @@ Editor::set_internal_edit (bool yn) } else { - mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range"))))); - mouse_select_button.get_image ()->show (); + mouse_select_button.set_image (::get_icon("tool_range")); ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges")); mouse_mode_toggled (mouse_mode); // sets cursor |