painter.setRenderHint(QPainter::Antialiasing);
const int v_offset = _view.v_offset();
+ const bool dragging = !_drag_sigs.empty();
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
0, s->get_v_offset() - v_offset,
w, View::SignalHeight);
- s->paint_label(painter, signal_heading_rect,
- s->pt_in_label_rect(signal_heading_rect, _mouse_point));
+ const bool highlight = !dragging && s->pt_in_label_rect(
+ signal_heading_rect, _mouse_point);
+ s->paint_label(painter, signal_heading_rect, highlight);
}
painter.end();
if(~QApplication::keyboardModifiers() & Qt::ControlModifier) {
// Unselect all other signals because the Ctrl is not
// pressed
+ _drag_sigs.clear();
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
s->select(false);
}
- // Select the signal if it has been clicked
- const shared_ptr<Signal> mouse_over_signal =
- get_mouse_over_signal(event->pos());
- if(mouse_over_signal)
- mouse_over_signal->select(!mouse_over_signal->selected());
-
if(event->button() & Qt::LeftButton) {
_mouse_down_point = event->pos();
- // Save the current signal offsets
+ // Save the offsets of any signals which will be dragged
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
- _mouse_down_signal_offsets[s.get()] =
- s->get_v_offset();
+ if(s->selected())
+ _drag_sigs.push_back(
+ make_pair(s, s->get_v_offset()));
+ }
+
+ // Select the signal if it has been clicked
+ const shared_ptr<Signal> mouse_over_signal =
+ get_mouse_over_signal(event->pos());
+ if(mouse_over_signal) {
+ if(mouse_over_signal->selected())
+ mouse_over_signal->select(false);
+ else {
+ mouse_over_signal->select(true);
+
+ // Add the signal to the drag list
+ _drag_sigs.push_back(
+ make_pair(mouse_over_signal,
+ mouse_over_signal->get_v_offset()));
+ }
}
update();
{
assert(event);
if(event->button() == Qt::LeftButton)
- _mouse_down_signal_offsets.clear();
+ _drag_sigs.clear();
}
void Header::mouseMoveEvent(QMouseEvent *event)
_mouse_point = event->pos();
// Move the signals if we are dragging
- if(!_mouse_down_signal_offsets.empty()) {
- const vector< shared_ptr<Signal> > &sigs =
- _view.session().get_signals();
+ if(!_drag_sigs.empty()) {
const int delta = event->pos().y() - _mouse_down_point.y();
- BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
- if(s->selected())
- s->set_v_offset(
- _mouse_down_signal_offsets[s.get()] +
- delta);
+ for(std::list<std::pair<boost::weak_ptr<Signal>,
+ int> >::iterator i = _drag_sigs.begin();
+ i != _drag_sigs.end(); i++) {
+ const boost::shared_ptr<Signal> sig((*i).first);
+ if(sig) {
+ const int y = (*i).second + delta;
+ const int y_snap =
+ ((y + View::SignalSnapGridSize / 2) /
+ View::SignalSnapGridSize) *
+ View::SignalSnapGridSize;
+ sig->set_v_offset(y_snap);
+
+ // Ensure the signal is selected
+ sig->select();
+ }
+
+ }
signals_moved();
}