git-svn-id: svn://db.shs.com.ru/libs@407 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2018-06-15 11:48:40 +00:00
parent 8d8a1c5be5
commit c10a004a4e

View File

@@ -238,15 +238,18 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
unmarkPins(true);
reconnectAll();
hideTmpBuses();
m_trace_with_buses = prev_tcb;
}
if (new_branch && mm_cancel) {
new_branch = false;
hideTmpBuses();
m_trace_with_buses = prev_tcb;
}
if (moved && mm_cancel) {
moved = false;
restoreSelState();
hideTmpBuses();
m_trace_with_buses = prev_tcb;
}
if (mm_cancel) return true;
mm_mods = me->modifiers();
@@ -555,6 +558,7 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
BlockItemPin * pin = getPin(scene_->items(me->scenePos()));
if (pin)
pin->hoverEnterEvent(0);
m_trace_with_buses = prev_tcb;
}
clearBusStates();
if (!mm_drag) {
@@ -1554,7 +1558,6 @@ void BlockView::hideTmpBuses(bool clear) {
qDeleteAll(tmp_buses);
tmp_buses.clear();
}
m_trace_with_buses = prev_tcb;
}