Clean up use of first_move, move thresholding etc.
git-svn-id: svn://localhost/ardour2/branches/3.0@5116 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
parent
ac8c034908
commit
27915ccdc0
|
|
@ -50,7 +50,9 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i) :
|
|||
_grab_frame (0),
|
||||
_last_pointer_frame (0),
|
||||
_current_pointer_frame (0),
|
||||
_copy (false)
|
||||
_copy (false),
|
||||
_had_movement (false),
|
||||
_move_threshold_passed (false)
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -97,9 +99,6 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor)
|
|||
_current_pointer_y = _grab_y;
|
||||
_last_pointer_x = _current_pointer_x;
|
||||
_last_pointer_y = _current_pointer_y;
|
||||
_first_move = true;
|
||||
_move_threshold_passed = false;
|
||||
_want_move_threshold = false;
|
||||
|
||||
_original_x = 0;
|
||||
_original_y = 0;
|
||||
|
|
@ -127,7 +126,9 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor)
|
|||
}
|
||||
}
|
||||
|
||||
/* @param event GDK event, or 0 */
|
||||
/** @param event GDK event, or 0.
|
||||
* @return true if some movement occurred, otherwise false.
|
||||
*/
|
||||
bool
|
||||
Drag::end_grab (GdkEvent* event)
|
||||
{
|
||||
|
|
@ -140,18 +141,16 @@ Drag::end_grab (GdkEvent* event)
|
|||
if (event) {
|
||||
_last_pointer_x = _current_pointer_x;
|
||||
_last_pointer_y = _current_pointer_y;
|
||||
finished (event);
|
||||
finished (event, _had_movement);
|
||||
}
|
||||
|
||||
bool const did_drag = !_first_move;
|
||||
|
||||
_editor->hide_verbose_canvas_cursor();
|
||||
|
||||
update_selection ();
|
||||
|
||||
_ending = false;
|
||||
|
||||
return did_drag;
|
||||
return _had_movement;
|
||||
}
|
||||
|
||||
nframes64_t
|
||||
|
|
@ -172,20 +171,33 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll)
|
|||
_current_pointer_frame = _editor->event_frame (event, &_current_pointer_x, &_current_pointer_y);
|
||||
|
||||
if (!from_autoscroll && !_move_threshold_passed) {
|
||||
bool xp = (::llabs ((nframes64_t) (_current_pointer_x - _grab_x)) > 4LL);
|
||||
bool yp = (::llabs ((nframes64_t) (_current_pointer_y - _grab_y)) > 4LL);
|
||||
|
||||
bool const xp = (::llabs ((nframes64_t) (_current_pointer_x - _grab_x)) > 4LL);
|
||||
bool const yp = (::llabs ((nframes64_t) (_current_pointer_y - _grab_y)) > 4LL);
|
||||
|
||||
_move_threshold_passed = (xp || yp);
|
||||
|
||||
if (_want_move_threshold && _move_threshold_passed) {
|
||||
if (apply_move_threshold() && _move_threshold_passed) {
|
||||
|
||||
_grab_frame = _current_pointer_frame;
|
||||
_grab_x = _current_pointer_x;
|
||||
_grab_y = _current_pointer_y;
|
||||
_last_pointer_frame = _grab_frame;
|
||||
_pointer_frame_offset = _grab_frame - _last_frame_position;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
bool old_had_movement = _had_movement;
|
||||
|
||||
/* a motion event has happened, so we've had movement... */
|
||||
_had_movement = true;
|
||||
|
||||
/* ... unless we're using a move threshold and we've not yet passed it */
|
||||
if (apply_move_threshold() && !_move_threshold_passed) {
|
||||
_had_movement = false;
|
||||
}
|
||||
|
||||
if (active (_editor->mouse_mode)) {
|
||||
|
||||
if (event->motion.state & Gdk::BUTTON1_MASK || event->motion.state & Gdk::BUTTON2_MASK) {
|
||||
|
|
@ -193,7 +205,7 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll)
|
|||
_editor->maybe_autoscroll (&event->motion);
|
||||
}
|
||||
|
||||
motion (event);
|
||||
motion (event, _had_movement != old_had_movement);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -248,7 +260,6 @@ RegionMoveDrag::RegionMoveDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p,
|
|||
: RegionDrag (e, i, p, v),
|
||||
_brushing (b)
|
||||
{
|
||||
_want_move_threshold = true;
|
||||
_copy = c;
|
||||
|
||||
TimeAxisView* const tv = &_primary->get_time_axis_view ();
|
||||
|
|
@ -275,9 +286,9 @@ RegionMoveDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
|
|||
}
|
||||
|
||||
void
|
||||
RegionMoveDrag::motion (GdkEvent* event)
|
||||
RegionMoveDrag::motion (GdkEvent* event, bool first_move)
|
||||
{
|
||||
double x_delta;
|
||||
double x_delta = 0;
|
||||
double y_delta = 0;
|
||||
nframes64_t pending_region_position = 0;
|
||||
int32_t pointer_order_span = 0, canvas_pointer_order_span = 0;
|
||||
|
|
@ -286,9 +297,8 @@ RegionMoveDrag::motion (GdkEvent* event)
|
|||
bool clamp_y_axis = false;
|
||||
vector<int32_t>::iterator j;
|
||||
|
||||
if (_copy && _move_threshold_passed && _want_move_threshold) {
|
||||
if (_copy && first_move) {
|
||||
copy_regions (event);
|
||||
_want_move_threshold = false; // don't copy again
|
||||
}
|
||||
|
||||
/* *pointer* variables reflect things about the pointer; as we may be moving
|
||||
|
|
@ -444,8 +454,6 @@ RegionMoveDrag::motion (GdkEvent* event)
|
|||
/* compute the amount of pointer motion in frames, and where
|
||||
the region would be if we moved it by that much.
|
||||
*/
|
||||
if (_move_threshold_passed) {
|
||||
|
||||
if (_current_pointer_frame >= _pointer_frame_offset) {
|
||||
|
||||
nframes64_t sync_frame;
|
||||
|
|
@ -530,11 +538,6 @@ RegionMoveDrag::motion (GdkEvent* event)
|
|||
x_delta = 0;
|
||||
}
|
||||
|
||||
} else {
|
||||
/* threshold not passed */
|
||||
|
||||
x_delta = 0;
|
||||
}
|
||||
|
||||
/*************************************************************
|
||||
PREPARE TO MOVE
|
||||
|
|
@ -550,14 +553,6 @@ RegionMoveDrag::motion (GdkEvent* event)
|
|||
/*************************************************************
|
||||
MOTION
|
||||
************************************************************/
|
||||
bool do_move = true;
|
||||
if (_first_move) {
|
||||
if (!_move_threshold_passed) {
|
||||
do_move = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (do_move) {
|
||||
|
||||
pair<set<boost::shared_ptr<Playlist> >::iterator,bool> insert_result;
|
||||
|
||||
|
|
@ -591,7 +586,7 @@ RegionMoveDrag::motion (GdkEvent* event)
|
|||
/* compensate for the ruler section and the vertical scrollbar position */
|
||||
iy1 += _editor->get_trackview_group_vertical_offset ();
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
|
||||
// hide any dependent views
|
||||
|
||||
|
|
@ -722,11 +717,8 @@ RegionMoveDrag::motion (GdkEvent* event)
|
|||
|
||||
} /* foreach region */
|
||||
|
||||
} /* if do_move */
|
||||
|
||||
if (_first_move && _move_threshold_passed) {
|
||||
if (first_move) {
|
||||
_editor->cursor_group->raise_to_top();
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
if (x_delta != 0 && !_brushing) {
|
||||
|
|
@ -735,7 +727,7 @@ RegionMoveDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
void
|
||||
RegionMoveDrag::finished (GdkEvent* event)
|
||||
RegionMoveDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
bool nocommit = true;
|
||||
vector<RegionView*> copies;
|
||||
|
|
@ -753,11 +745,7 @@ RegionMoveDrag::finished (GdkEvent* event)
|
|||
pair<TimeAxisView*, int> tvp;
|
||||
map<RegionView*, RouteTimeAxisView*> final;
|
||||
|
||||
/* _first_move is set to false if the regionview has been moved in the
|
||||
motion handler.
|
||||
*/
|
||||
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
/* just a click */
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1194,7 +1182,7 @@ struct RegionSelectionByPosition {
|
|||
};
|
||||
|
||||
void
|
||||
RegionSpliceDrag::motion (GdkEvent* event)
|
||||
RegionSpliceDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
RouteTimeAxisView* tv;
|
||||
layer_t layer;
|
||||
|
|
@ -1203,10 +1191,6 @@ RegionSpliceDrag::motion (GdkEvent* event)
|
|||
return;
|
||||
}
|
||||
|
||||
if (!_move_threshold_passed) {
|
||||
return;
|
||||
}
|
||||
|
||||
int dir;
|
||||
|
||||
if (_current_pointer_x - _grab_x > 0) {
|
||||
|
|
@ -1256,7 +1240,7 @@ RegionSpliceDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
void
|
||||
RegionSpliceDrag::finished (GdkEvent* event)
|
||||
RegionSpliceDrag::finished (GdkEvent* event, bool)
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -1279,20 +1263,17 @@ RegionCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
|
|||
|
||||
|
||||
void
|
||||
RegionCreateDrag::motion (GdkEvent* event)
|
||||
RegionCreateDrag::motion (GdkEvent* event, bool first_move)
|
||||
{
|
||||
if (_move_threshold_passed) {
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
// TODO: create region-create-drag region view here
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
// TODO: resize region-create-drag region view here
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
RegionCreateDrag::finished (GdkEvent* event)
|
||||
RegionCreateDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (_dest_trackview);
|
||||
if (!mtv) {
|
||||
|
|
@ -1307,7 +1288,7 @@ RegionCreateDrag::finished (GdkEvent* event)
|
|||
return;
|
||||
}
|
||||
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
_editor->begin_reversible_command (_("create region"));
|
||||
XMLNode &before = mtv->playlist()->get_state();
|
||||
|
||||
|
|
@ -1327,7 +1308,7 @@ RegionCreateDrag::finished (GdkEvent* event)
|
|||
_editor->commit_reversible_command();
|
||||
|
||||
} else {
|
||||
motion (event);
|
||||
motion (event, false);
|
||||
// TODO: create region-create-drag region here
|
||||
}
|
||||
}
|
||||
|
|
@ -1336,15 +1317,13 @@ RegionCreateDrag::finished (GdkEvent* event)
|
|||
|
||||
|
||||
void
|
||||
RegionGainDrag::motion (GdkEvent* event)
|
||||
RegionGainDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
if (_first_move && _move_threshold_passed) {
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
RegionGainDrag::finished (GdkEvent *)
|
||||
RegionGainDrag::finished (GdkEvent *, bool)
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -1399,7 +1378,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
|
|||
}
|
||||
|
||||
void
|
||||
TrimDrag::motion (GdkEvent* event)
|
||||
TrimDrag::motion (GdkEvent* event, bool first_move)
|
||||
{
|
||||
RegionView* rv = _primary;
|
||||
nframes64_t frame_delta = 0;
|
||||
|
|
@ -1435,7 +1414,7 @@ TrimDrag::motion (GdkEvent* event)
|
|||
return;
|
||||
}
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
|
||||
string trim_type;
|
||||
|
||||
|
|
@ -1537,15 +1516,14 @@ TrimDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
_last_pointer_frame = _current_pointer_frame;
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
TrimDrag::finished (GdkEvent* event)
|
||||
TrimDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (!_first_move) {
|
||||
motion (event);
|
||||
if (movement_occurred) {
|
||||
motion (event, false);
|
||||
|
||||
if (!_editor->selection->selected (_primary)) {
|
||||
_editor->thaw_region_after_trim (*_primary);
|
||||
|
|
@ -1612,7 +1590,7 @@ MeterMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
|||
}
|
||||
|
||||
void
|
||||
MeterMarkerDrag::motion (GdkEvent* event)
|
||||
MeterMarkerDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
nframes64_t adjusted_frame = adjusted_current_frame ();
|
||||
|
||||
|
|
@ -1627,19 +1605,18 @@ MeterMarkerDrag::motion (GdkEvent* event)
|
|||
_marker->set_position (adjusted_frame);
|
||||
|
||||
_last_pointer_frame = adjusted_frame;
|
||||
_first_move = false;
|
||||
|
||||
_editor->show_verbose_time_cursor (adjusted_frame, 10);
|
||||
}
|
||||
|
||||
void
|
||||
MeterMarkerDrag::finished (GdkEvent* event)
|
||||
MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
return;
|
||||
}
|
||||
|
||||
motion (event);
|
||||
motion (event, false);
|
||||
|
||||
BBT_Time when;
|
||||
|
||||
|
|
@ -1708,7 +1685,7 @@ TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
|||
}
|
||||
|
||||
void
|
||||
TempoMarkerDrag::motion (GdkEvent* event)
|
||||
TempoMarkerDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
nframes64_t adjusted_frame = adjusted_current_frame ();
|
||||
|
||||
|
|
@ -1727,17 +1704,16 @@ TempoMarkerDrag::motion (GdkEvent* event)
|
|||
_editor->show_verbose_time_cursor (adjusted_frame, 10);
|
||||
|
||||
_last_pointer_frame = adjusted_frame;
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
void
|
||||
TempoMarkerDrag::finished (GdkEvent* event)
|
||||
TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
return;
|
||||
}
|
||||
|
||||
motion (event);
|
||||
motion (event, false);
|
||||
|
||||
BBT_Time when;
|
||||
|
||||
|
|
@ -1806,7 +1782,7 @@ CursorDrag::start_grab (GdkEvent* event, Gdk::Cursor* c)
|
|||
}
|
||||
|
||||
void
|
||||
CursorDrag::motion (GdkEvent* event)
|
||||
CursorDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
nframes64_t adjusted_frame = adjusted_current_frame ();
|
||||
|
||||
|
|
@ -1830,19 +1806,18 @@ CursorDrag::motion (GdkEvent* event)
|
|||
_editor->UpdateAllTransportClocks (_cursor->current_frame);
|
||||
|
||||
_last_pointer_frame = adjusted_frame;
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
void
|
||||
CursorDrag::finished (GdkEvent* event)
|
||||
CursorDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
_editor->_dragging_playhead = false;
|
||||
|
||||
if (_first_move && _stop) {
|
||||
if (!movement_occurred && _stop) {
|
||||
return;
|
||||
}
|
||||
|
||||
motion (event);
|
||||
motion (event, false);
|
||||
|
||||
if (_item == &_editor->playhead_cursor->canvas_item) {
|
||||
if (_editor->session) {
|
||||
|
|
@ -1870,7 +1845,7 @@ FadeInDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
|||
}
|
||||
|
||||
void
|
||||
FadeInDrag::motion (GdkEvent* event)
|
||||
FadeInDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
nframes64_t fade_length;
|
||||
|
||||
|
|
@ -1902,19 +1877,17 @@ FadeInDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
_editor->show_verbose_duration_cursor (region->position(), region->position() + fade_length, 10);
|
||||
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
void
|
||||
FadeInDrag::finished (GdkEvent* event)
|
||||
FadeInDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
nframes64_t fade_length;
|
||||
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
return;
|
||||
}
|
||||
|
||||
nframes64_t fade_length;
|
||||
|
||||
nframes64_t const pos = adjusted_current_frame ();
|
||||
|
||||
boost::shared_ptr<Region> region = _primary->region ();
|
||||
|
|
@ -1968,7 +1941,7 @@ FadeOutDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
|||
}
|
||||
|
||||
void
|
||||
FadeOutDrag::motion (GdkEvent* event)
|
||||
FadeOutDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
nframes64_t fade_length;
|
||||
|
||||
|
|
@ -2002,14 +1975,12 @@ FadeOutDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
_editor->show_verbose_duration_cursor (region->last_frame() - fade_length, region->last_frame(), 10);
|
||||
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
void
|
||||
FadeOutDrag::finished (GdkEvent* event)
|
||||
FadeOutDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2158,7 +2129,7 @@ MarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
|||
}
|
||||
|
||||
void
|
||||
MarkerDrag::motion (GdkEvent* event)
|
||||
MarkerDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
nframes64_t f_delta = 0;
|
||||
bool is_start;
|
||||
|
|
@ -2301,7 +2272,6 @@ MarkerDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
_last_pointer_frame = _current_pointer_frame;
|
||||
_first_move = false;
|
||||
|
||||
assert (!_copied_locations.empty());
|
||||
|
||||
|
|
@ -2315,9 +2285,9 @@ MarkerDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
void
|
||||
MarkerDrag::finished (GdkEvent* event)
|
||||
MarkerDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
|
||||
/* just a click, do nothing but finish
|
||||
off the selection process
|
||||
|
|
@ -2343,7 +2313,6 @@ MarkerDrag::finished (GdkEvent* event)
|
|||
|
||||
_editor->_dragging_edit_point = false;
|
||||
|
||||
|
||||
_editor->begin_reversible_command ( _("move marker") );
|
||||
XMLNode &before = _editor->session->locations()->get_state();
|
||||
|
||||
|
|
@ -2423,7 +2392,7 @@ ControlPointDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
|||
}
|
||||
|
||||
void
|
||||
ControlPointDrag::motion (GdkEvent* event)
|
||||
ControlPointDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
double dx = _current_pointer_x - _last_pointer_x;
|
||||
double dy = _current_pointer_y - _last_pointer_y;
|
||||
|
|
@ -2478,14 +2447,12 @@ ControlPointDrag::motion (GdkEvent* event)
|
|||
_point->line().point_drag (*_point, cx_frames, fraction, push);
|
||||
|
||||
_editor->set_verbose_canvas_cursor_text (_point->line().get_verbose_cursor_string (fraction));
|
||||
|
||||
_first_move = false;
|
||||
}
|
||||
|
||||
void
|
||||
ControlPointDrag::finished (GdkEvent* event)
|
||||
ControlPointDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
|
||||
/* just a click */
|
||||
|
||||
|
|
@ -2494,7 +2461,7 @@ ControlPointDrag::finished (GdkEvent* event)
|
|||
}
|
||||
|
||||
} else {
|
||||
motion (event);
|
||||
motion (event, false);
|
||||
}
|
||||
_point->line().end_drag (_point);
|
||||
}
|
||||
|
|
@ -2548,7 +2515,7 @@ LineDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
|
|||
}
|
||||
|
||||
void
|
||||
LineDrag::motion (GdkEvent* event)
|
||||
LineDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
double dy = _current_pointer_y - _last_pointer_y;
|
||||
|
||||
|
|
@ -2579,9 +2546,9 @@ LineDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
void
|
||||
LineDrag::finished (GdkEvent* event)
|
||||
LineDrag::finished (GdkEvent* event, bool)
|
||||
{
|
||||
motion (event);
|
||||
motion (event, false);
|
||||
_line->end_drag (0);
|
||||
}
|
||||
|
||||
|
|
@ -2593,7 +2560,7 @@ RubberbandSelectDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
|
|||
}
|
||||
|
||||
void
|
||||
RubberbandSelectDrag::motion (GdkEvent* event)
|
||||
RubberbandSelectDrag::motion (GdkEvent* event, bool first_move)
|
||||
{
|
||||
nframes64_t start;
|
||||
nframes64_t end;
|
||||
|
|
@ -2607,7 +2574,7 @@ RubberbandSelectDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier()) && Config->get_rubberbanding_snaps_to_grid()) {
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
_editor->snap_to (_grab_frame);
|
||||
}
|
||||
_editor->snap_to (_current_pointer_frame);
|
||||
|
|
@ -2646,18 +2613,17 @@ RubberbandSelectDrag::motion (GdkEvent* event)
|
|||
_editor->rubberband_rect->raise_to_top();
|
||||
|
||||
_last_pointer_frame = _current_pointer_frame;
|
||||
_first_move = false;
|
||||
|
||||
_editor->show_verbose_time_cursor (_current_pointer_frame, 10);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
RubberbandSelectDrag::finished (GdkEvent* event)
|
||||
RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (!_first_move) {
|
||||
if (movement_occurred) {
|
||||
|
||||
motion (event);
|
||||
motion (event, false);
|
||||
|
||||
double y1,y2;
|
||||
if (_current_pointer_y < _grab_y) {
|
||||
|
|
@ -2705,7 +2671,7 @@ TimeFXDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
|
|||
}
|
||||
|
||||
void
|
||||
TimeFXDrag::motion (GdkEvent* event)
|
||||
TimeFXDrag::motion (GdkEvent* event, bool)
|
||||
{
|
||||
RegionView* rv = _primary;
|
||||
|
||||
|
|
@ -2722,17 +2688,16 @@ TimeFXDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
_last_pointer_frame = _current_pointer_frame;
|
||||
_first_move = false;
|
||||
|
||||
_editor->show_verbose_time_cursor (_current_pointer_frame, 10);
|
||||
}
|
||||
|
||||
void
|
||||
TimeFXDrag::finished (GdkEvent* event)
|
||||
TimeFXDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
_primary->get_time_axis_view().hide_timestretch ();
|
||||
|
||||
if (_first_move) {
|
||||
if (!movement_occurred) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2829,7 +2794,7 @@ SelectionDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
|
|||
}
|
||||
|
||||
void
|
||||
SelectionDrag::motion (GdkEvent* event)
|
||||
SelectionDrag::motion (GdkEvent* event, bool first_move)
|
||||
{
|
||||
nframes64_t start = 0;
|
||||
nframes64_t end = 0;
|
||||
|
|
@ -2852,7 +2817,7 @@ SelectionDrag::motion (GdkEvent* event)
|
|||
switch (_operation) {
|
||||
case CreateSelection:
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
_editor->snap_to (_grab_frame);
|
||||
}
|
||||
|
||||
|
|
@ -2868,7 +2833,7 @@ SelectionDrag::motion (GdkEvent* event)
|
|||
or create a new selection->
|
||||
*/
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
|
||||
_editor->begin_reversible_command (_("range selection"));
|
||||
|
||||
|
|
@ -2885,7 +2850,7 @@ SelectionDrag::motion (GdkEvent* event)
|
|||
|
||||
case SelectionStartTrim:
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
_editor->begin_reversible_command (_("trim selection start"));
|
||||
}
|
||||
|
||||
|
|
@ -2901,7 +2866,7 @@ SelectionDrag::motion (GdkEvent* event)
|
|||
|
||||
case SelectionEndTrim:
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
_editor->begin_reversible_command (_("trim selection end"));
|
||||
}
|
||||
|
||||
|
|
@ -2918,7 +2883,7 @@ SelectionDrag::motion (GdkEvent* event)
|
|||
|
||||
case SelectionMove:
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
_editor->begin_reversible_command (_("move selection"));
|
||||
}
|
||||
|
||||
|
|
@ -2944,7 +2909,6 @@ SelectionDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
_last_pointer_frame = pending_position;
|
||||
_first_move = false;
|
||||
|
||||
if (_operation == SelectionMove) {
|
||||
_editor->show_verbose_time_cursor(start, 10);
|
||||
|
|
@ -2954,10 +2918,10 @@ SelectionDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
void
|
||||
SelectionDrag::finished (GdkEvent* event)
|
||||
SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (!_first_move) {
|
||||
motion (event);
|
||||
if (movement_occurred) {
|
||||
motion (event, false);
|
||||
/* XXX this is not object-oriented programming at all. ick */
|
||||
if (_editor->selection->time.consolidate()) {
|
||||
_editor->selection->TimeChanged ();
|
||||
|
|
@ -3022,7 +2986,7 @@ RangeMarkerBarDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
|
|||
}
|
||||
|
||||
void
|
||||
RangeMarkerBarDrag::motion (GdkEvent* event)
|
||||
RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move)
|
||||
{
|
||||
nframes64_t start = 0;
|
||||
nframes64_t end = 0;
|
||||
|
|
@ -3060,7 +3024,7 @@ RangeMarkerBarDrag::motion (GdkEvent* event)
|
|||
case CreateRangeMarker:
|
||||
case CreateTransportMarker:
|
||||
case CreateCDMarker:
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
_editor->snap_to (_grab_frame);
|
||||
}
|
||||
|
||||
|
|
@ -3076,7 +3040,7 @@ RangeMarkerBarDrag::motion (GdkEvent* event)
|
|||
or create a new selection.
|
||||
*/
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
|
||||
_editor->temp_location->set (start, end);
|
||||
|
||||
|
|
@ -3106,21 +3070,20 @@ RangeMarkerBarDrag::motion (GdkEvent* event)
|
|||
}
|
||||
|
||||
_last_pointer_frame = _current_pointer_frame;
|
||||
_first_move = false;
|
||||
|
||||
_editor->show_verbose_time_cursor (_current_pointer_frame, 10);
|
||||
|
||||
}
|
||||
|
||||
void
|
||||
RangeMarkerBarDrag::finished (GdkEvent* event)
|
||||
RangeMarkerBarDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
Location * newloc = 0;
|
||||
string rangename;
|
||||
int flags;
|
||||
|
||||
if (!_first_move) {
|
||||
motion (event);
|
||||
if (movement_occurred) {
|
||||
motion (event, false);
|
||||
|
||||
switch (_operation) {
|
||||
case CreateRangeMarker:
|
||||
|
|
@ -3212,7 +3175,7 @@ MouseZoomDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
|
|||
}
|
||||
|
||||
void
|
||||
MouseZoomDrag::motion (GdkEvent* event)
|
||||
MouseZoomDrag::motion (GdkEvent* event, bool first_move)
|
||||
{
|
||||
nframes64_t start;
|
||||
nframes64_t end;
|
||||
|
|
@ -3220,7 +3183,7 @@ MouseZoomDrag::motion (GdkEvent* event)
|
|||
if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
|
||||
_editor->snap_to (_current_pointer_frame);
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
_editor->snap_to (_grab_frame);
|
||||
}
|
||||
}
|
||||
|
|
@ -3240,7 +3203,7 @@ MouseZoomDrag::motion (GdkEvent* event)
|
|||
|
||||
if (start != end) {
|
||||
|
||||
if (_first_move) {
|
||||
if (first_move) {
|
||||
_editor->zoom_rect->show();
|
||||
_editor->zoom_rect->raise_to_top();
|
||||
}
|
||||
|
|
@ -3248,17 +3211,16 @@ MouseZoomDrag::motion (GdkEvent* event)
|
|||
_editor->reposition_zoom_rect(start, end);
|
||||
|
||||
_last_pointer_frame = _current_pointer_frame;
|
||||
_first_move = false;
|
||||
|
||||
_editor->show_verbose_time_cursor (_current_pointer_frame, 10);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
MouseZoomDrag::finished (GdkEvent* event)
|
||||
MouseZoomDrag::finished (GdkEvent* event, bool movement_occurred)
|
||||
{
|
||||
if (!_first_move) {
|
||||
motion (event);
|
||||
if (movement_occurred) {
|
||||
motion (event, false);
|
||||
|
||||
if (_grab_frame < _last_pointer_frame) {
|
||||
_editor->temporal_zoom_by_frame (_grab_frame, _last_pointer_frame, "mouse zoom");
|
||||
|
|
|
|||
|
|
@ -61,11 +61,6 @@ public:
|
|||
return _ending;
|
||||
}
|
||||
|
||||
/** @return true if the first move (past any move threshold) has occurred */
|
||||
bool first_move () const {
|
||||
return _first_move;
|
||||
}
|
||||
|
||||
/** @return current pointer x position in item coordinates */
|
||||
double current_pointer_x () const {
|
||||
return _current_pointer_x;
|
||||
|
|
@ -91,13 +86,15 @@ public:
|
|||
|
||||
/** Called when a drag motion has occurred.
|
||||
* @param e Event describing the motion.
|
||||
* @param f true if this is the first movement, otherwise false.
|
||||
*/
|
||||
virtual void motion (GdkEvent* e) = 0;
|
||||
virtual void motion (GdkEvent* e, bool f) = 0;
|
||||
|
||||
/** Called when a drag has finished.
|
||||
* @param e Event describing the finish.
|
||||
* @param m true if some movement occurred, otherwise false.
|
||||
*/
|
||||
virtual void finished (GdkEvent *) = 0;
|
||||
virtual void finished (GdkEvent* e, bool m) = 0;
|
||||
|
||||
/** @param m Mouse mode.
|
||||
* @return true if this drag should happen in this mouse mode.
|
||||
|
|
@ -106,6 +103,13 @@ public:
|
|||
return (m != Editing::MouseGain);
|
||||
}
|
||||
|
||||
/** @return true if a small threshold should be applied before a mouse movement
|
||||
* is considered a drag, otherwise false.
|
||||
*/
|
||||
virtual bool apply_move_threshold () const {
|
||||
return false;
|
||||
}
|
||||
|
||||
/** Called when a subclass should update the editor's selection following a drag */
|
||||
virtual void update_selection () {}
|
||||
|
||||
|
|
@ -132,13 +136,12 @@ protected:
|
|||
bool _y_constrained; ///< true if y motion is constrained, otherwise false
|
||||
bool _copy; ///< true if we're copying the things that we're dragging
|
||||
bool _was_rolling; ///< true if the session was rolling before the drag started, otherwise false
|
||||
bool _first_move; ///< true if some movement has occurred, otherwise false
|
||||
bool _move_threshold_passed; ///< true if the move threshold has been passed, otherwise false
|
||||
bool _want_move_threshold; ///< true if a move threshold should be applied, otherwise false
|
||||
|
||||
private:
|
||||
|
||||
bool _ending; ///< true if end_grab is in progress, otherwise false
|
||||
bool _had_movement; ///< true if movement has occurred, otherwise false
|
||||
bool _move_threshold_passed; ///< true if the move threshold has been passed, otherwise false
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -169,8 +172,11 @@ public:
|
|||
virtual ~RegionMoveDrag () {}
|
||||
|
||||
virtual void start_grab (GdkEvent *, Gdk::Cursor *);
|
||||
virtual void motion (GdkEvent *);
|
||||
virtual void finished (GdkEvent *);
|
||||
virtual void motion (GdkEvent *, bool);
|
||||
virtual void finished (GdkEvent *, bool);
|
||||
bool apply_move_threshold () const {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
|
|
@ -193,8 +199,8 @@ class RegionSpliceDrag : public RegionMoveDrag
|
|||
public:
|
||||
RegionSpliceDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list<RegionView*> const &);
|
||||
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
};
|
||||
|
||||
/** Drags to create regions */
|
||||
|
|
@ -204,8 +210,8 @@ public:
|
|||
RegionCreateDrag (Editor *, ArdourCanvas::Item *, TimeAxisView *);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
TimeAxisView* _view;
|
||||
|
|
@ -218,8 +224,8 @@ class RegionGainDrag : public Drag
|
|||
public:
|
||||
RegionGainDrag (Editor *e, ArdourCanvas::Item *i) : Drag (e, i) {}
|
||||
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
bool active (Editing::MouseMode m) {
|
||||
return (m == Editing::MouseGain);
|
||||
}
|
||||
|
|
@ -238,8 +244,8 @@ public:
|
|||
TrimDrag (Editor *, ArdourCanvas::Item *, RegionView*, std::list<RegionView*> const &);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -253,8 +259,8 @@ public:
|
|||
MeterMarkerDrag (Editor *, ArdourCanvas::Item *, bool);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
MeterMarker* _marker;
|
||||
|
|
@ -267,8 +273,8 @@ public:
|
|||
TempoMarkerDrag (Editor *, ArdourCanvas::Item *, bool);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
TempoMarker* _marker;
|
||||
|
|
@ -282,8 +288,8 @@ public:
|
|||
CursorDrag (Editor *, ArdourCanvas::Item *, bool);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
EditorCursor* _cursor; ///< cursor being dragged
|
||||
|
|
@ -298,8 +304,8 @@ public:
|
|||
FadeInDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list<RegionView*> const &);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
};
|
||||
|
||||
/** Region fade-out drag */
|
||||
|
|
@ -309,8 +315,8 @@ public:
|
|||
FadeOutDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list<RegionView*> const &);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
};
|
||||
|
||||
/** Marker drag */
|
||||
|
|
@ -321,8 +327,8 @@ public:
|
|||
~MarkerDrag ();
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
void update_item (ARDOUR::Location *);
|
||||
|
|
@ -340,8 +346,8 @@ public:
|
|||
ControlPointDrag (Editor *, ArdourCanvas::Item *);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -358,8 +364,8 @@ public:
|
|||
LineDrag (Editor *e, ArdourCanvas::Item *i);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
|
||||
|
|
@ -376,8 +382,8 @@ public:
|
|||
RubberbandSelectDrag (Editor *e, ArdourCanvas::Item *i) : Drag (e, i) {}
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
};
|
||||
|
||||
/** Region drag in time-FX mode */
|
||||
|
|
@ -387,8 +393,8 @@ public:
|
|||
TimeFXDrag (Editor *e, ArdourCanvas::Item *i, RegionView* p, std::list<RegionView*> const & v) : RegionDrag (e, i, p, v) {}
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
};
|
||||
|
||||
/** Drag in range selection mode */
|
||||
|
|
@ -405,8 +411,8 @@ public:
|
|||
SelectionDrag (Editor *, ArdourCanvas::Item *, Operation);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
Operation _operation;
|
||||
|
|
@ -425,8 +431,8 @@ public:
|
|||
RangeMarkerBarDrag (Editor *, ArdourCanvas::Item *, Operation);
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
|
||||
private:
|
||||
void update_item (ARDOUR::Location *);
|
||||
|
|
@ -442,8 +448,8 @@ public:
|
|||
MouseZoomDrag (Editor *e, ArdourCanvas::Item *i) : Drag (e, i) {}
|
||||
|
||||
void start_grab (GdkEvent *, Gdk::Cursor* c = 0);
|
||||
void motion (GdkEvent *);
|
||||
void finished (GdkEvent *);
|
||||
void motion (GdkEvent *, bool);
|
||||
void finished (GdkEvent *, bool);
|
||||
};
|
||||
|
||||
#endif /* __gtk2_ardour_editor_drag_h_ */
|
||||
|
|
|
|||
|
|
@ -1102,6 +1102,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||
|
||||
/* first, see if we're finishing a drag ... */
|
||||
|
||||
bool were_dragging = false;
|
||||
if (_drag) {
|
||||
bool const r = _drag->end_grab (event);
|
||||
delete _drag;
|
||||
|
|
@ -1110,6 +1111,8 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||
/* grab dragged, so do nothing else */
|
||||
return true;
|
||||
}
|
||||
|
||||
were_dragging = true;
|
||||
}
|
||||
|
||||
button_selection (item, event, item_type);
|
||||
|
|
@ -1349,7 +1352,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
|||
its really annoying to create new control
|
||||
points when doing this.
|
||||
*/
|
||||
if (_drag->first_move ()) {
|
||||
if (were_dragging) {
|
||||
dynamic_cast<AudioRegionView*>(clicked_regionview)->add_gain_point_event (item, event);
|
||||
}
|
||||
return true;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user