ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

make step edit cursor follow zoom (and change its color a bit)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7601 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-08-11 20:16:39 +00:00
parent 8bdf5cf1d0
commit 1b42936caa
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk2_ardour/midi_region_view.cc
View File

@ -90,6 +90,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
, _drag_rect (0)
, _step_edit_cursor (0)
, _step_edit_cursor_width (1.0)
, _step_edit_cursor_position (0.0)
, _mouse_state(None)
, _pressed_button(0)
, _sort_needed (true)
@ -1132,6 +1133,9 @@ MidiRegionView::reset_width_dependent_items (double pixel_width)
if (_enable_display) {
redisplay_model();
}
move_step_edit_cursor (_step_edit_cursor_position);
set_step_edit_cursor_width (_step_edit_cursor_width);
}
void
@ -3002,10 +3006,12 @@ MidiRegionView::show_step_edit_cursor (Evoral::MusicalTime pos)
void
MidiRegionView::move_step_edit_cursor (Evoral::MusicalTime pos)
{
_step_edit_cursor_position = pos;
if (_step_edit_cursor) {
double pixel = trackview.editor().frame_to_pixel (beats_to_frames (pos));
_step_edit_cursor->property_x1() = pixel;
_step_edit_cursor->property_x2() = pixel + _step_edit_cursor_width;
set_step_edit_cursor_width (_step_edit_cursor_width);
}
}
@ -3020,7 +3026,10 @@ MidiRegionView::hide_step_edit_cursor ()
void
MidiRegionView::set_step_edit_cursor_width (Evoral::MusicalTime beats)
{
_step_edit_cursor_width = trackview.editor().frame_to_pixel (beats_to_frames (beats));
_step_edit_cursor->property_x2() = _step_edit_cursor->property_x1() + _step_edit_cursor_width;
_step_edit_cursor_width = beats;
if (_step_edit_cursor) {
_step_edit_cursor->property_x2() = _step_edit_cursor->property_x1() + trackview.editor().frame_to_pixel (beats_to_frames (beats));
}
}

3
gtk2_ardour/midi_region_view.h
View File

@ -369,7 +369,8 @@ class MidiRegionView : public RegionView
double _last_y;
ArdourCanvas::SimpleRect* _drag_rect;
ArdourCanvas::SimpleRect* _step_edit_cursor;
double _step_edit_cursor_width;
Evoral::MusicalTime _step_edit_cursor_width;
Evoral::MusicalTime _step_edit_cursor_position;
MouseState _mouse_state;
int _pressed_button;