diff --git a/panels/timeline.cpp b/panels/timeline.cpp index c0b3f7a0a..d0402d2f9 100644 --- a/panels/timeline.cpp +++ b/panels/timeline.cpp @@ -746,7 +746,7 @@ void Timeline::split_at_playhead() } long getFrameFromScreenPoint(double zoom, int x) { - long f = qRound(double(x) / zoom); + long f = qFloor(double(x) / zoom); if (f < 0) { return 0; } diff --git a/timeline/track.cpp b/timeline/track.cpp index 37cbc7a91..0f360e994 100644 --- a/timeline/track.cpp +++ b/timeline/track.cpp @@ -246,8 +246,7 @@ bool Track::IsClipSelected(Clip *clip, bool containing) for (int i=0;itimeline_in() >= s.in() && clip->timeline_out() <= s.out()) - || (!containing && !(clip->timeline_in() < s.in() && clip->timeline_out() < s.in()) - && !(clip->timeline_in() > s.in() && clip->timeline_out() > s.in())))) { + || (!containing && !(clip->timeline_in() >= s.out() || clip->timeline_out() <= s.in())))) { return true; } } @@ -340,27 +339,27 @@ void Track::ClearSelections() void Track::DeselectArea(long in, long out) { int selection_count = selections_.size(); - for (int i=0;i= in && s.out() <= out) { - // whole selection is in deselect area - selections_.removeAt(i); - i--; - selection_count--; - } else if (s.in() < in && s.out() > out) { - // middle of selection is in deselect area - Selection new_sel(out, s.out(), s.track()); - selections_.append(new_sel); + if (s.in() >= in && s.out() <= out) { + // whole selection is in deselect area + selections_.removeAt(i); + i--; + selection_count--; + } else if (s.in() < in && s.out() > out) { + // middle of selection is in deselect area + Selection new_sel(out, s.out(), s.track()); + selections_.append(new_sel); - s.set_out(in); - } else if (s.in() < in && s.out() > in) { - // only out point is in deselect area - s.set_out(in); - } else if (s.in() < out && s.out() > out) { - // only in point is in deselect area - s.set_in(out); - } + s.set_out(in); + } else if (s.in() < in && s.out() > in) { + // only out point is in deselect area + s.set_out(in); + } else if (s.in() < out && s.out() > out) { + // only in point is in deselect area + s.set_in(out); + } } } diff --git a/ui/timelineview.cpp b/ui/timelineview.cpp index c18d30af5..755ec4f03 100644 --- a/ui/timelineview.cpp +++ b/ui/timelineview.cpp @@ -719,6 +719,7 @@ void TimelineView::mousePressEvent(QMouseEvent *event) { } hovered_clip->track()->SelectArea(s_in, s_out); } + } else { // if the clip is not already selected @@ -2497,9 +2498,9 @@ void TimelineView::mouseMoveEvent(QMouseEvent *event) { // // threshold around a trim point that the cursor can be within and still considered "trimming" - int lim = 5; - long mouse_frame_lower = ParentTimeline()->getTimelineFrameFromScreenPoint(pos.x()-lim)-1; - long mouse_frame_upper = ParentTimeline()->getTimelineFrameFromScreenPoint(pos.x()+lim)+1; + int lim = 10; // FIXME Magic number for the clip trimming threshold + int mouse_frame_lower = pos.x() - lim; + int mouse_frame_upper = pos.x() + lim; // used to determine whether we the cursor found a trim point or not bool found = false; @@ -2553,11 +2554,14 @@ void TimelineView::mouseMoveEvent(QMouseEvent *event) { } } + int visual_in_point = ParentTimeline()->getTimelineScreenPointFromFrame(c->timeline_in()); + int visual_out_point = ParentTimeline()->getTimelineScreenPointFromFrame(c->timeline_out()); + // is the cursor hovering around the clip's IN point? - if (c->timeline_in() > mouse_frame_lower && c->timeline_in() < mouse_frame_upper) { + if (visual_in_point > mouse_frame_lower && visual_in_point < mouse_frame_upper) { // test how close this IN point is to the cursor - long nc = qAbs(c->timeline_in() + 1 - ParentTimeline()->cursor_frame); + int nc = qAbs(visual_in_point + 1 - pos.x()); // and test whether it's closer than the last in/out point we found if (nc < closeness) { @@ -2572,10 +2576,10 @@ void TimelineView::mouseMoveEvent(QMouseEvent *event) { } // is the cursor hovering around the clip's OUT point? - if (c->timeline_out() > mouse_frame_lower && c->timeline_out() < mouse_frame_upper) { + if (visual_out_point > mouse_frame_lower && visual_out_point < mouse_frame_upper) { // test how close this OUT point is to the cursor - long nc = qAbs(c->timeline_out() - 1 - ParentTimeline()->cursor_frame); + int nc = qAbs(visual_out_point - 1 - pos.x()); // and test whether it's closer than the last in/out point we found if (nc < closeness) { @@ -2597,13 +2601,14 @@ void TimelineView::mouseMoveEvent(QMouseEvent *event) { if (c->opening_transition != nullptr) { // cache the timeline frame where the transition ends - long transition_point = c->timeline_in() + c->opening_transition->get_true_length(); + int transition_point = ParentTimeline()->getTimelineScreenPointFromFrame(c->timeline_in() + + c->opening_transition->get_true_length()); // check if the cursor is hovering around it (within the threshold) if (transition_point > mouse_frame_lower && transition_point < mouse_frame_upper) { // similar to above, test how close it is and if it's closer, make this active - long nc = qAbs(transition_point - 1 - ParentTimeline()->cursor_frame); + int nc = qAbs(transition_point - 1 - pos.x()); if (nc < closeness) { ParentTimeline()->trim_target = c; ParentTimeline()->trim_type = olive::timeline::TRIM_OUT; @@ -2618,13 +2623,14 @@ void TimelineView::mouseMoveEvent(QMouseEvent *event) { if (c->closing_transition != nullptr) { // cache the timeline frame where the transition starts - long transition_point = c->timeline_out() - c->closing_transition->get_true_length(); + int transition_point = ParentTimeline()->getTimelineScreenPointFromFrame(c->timeline_out() + - c->closing_transition->get_true_length()); // check if the cursor is hovering around it (within the threshold) if (transition_point > mouse_frame_lower && transition_point < mouse_frame_upper) { // similar to above, test how close it is and if it's closer, make this active - long nc = qAbs(transition_point + 1 - ParentTimeline()->cursor_frame); + int nc = qAbs(transition_point + 1 - pos.x()); if (nc < closeness) { ParentTimeline()->trim_target = c; ParentTimeline()->trim_type = olive::timeline::TRIM_IN;