git-svn-id: svn://db.shs.com.ru/libs@407 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -238,15 +238,18 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
|
|||||||
unmarkPins(true);
|
unmarkPins(true);
|
||||||
reconnectAll();
|
reconnectAll();
|
||||||
hideTmpBuses();
|
hideTmpBuses();
|
||||||
|
m_trace_with_buses = prev_tcb;
|
||||||
}
|
}
|
||||||
if (new_branch && mm_cancel) {
|
if (new_branch && mm_cancel) {
|
||||||
new_branch = false;
|
new_branch = false;
|
||||||
hideTmpBuses();
|
hideTmpBuses();
|
||||||
|
m_trace_with_buses = prev_tcb;
|
||||||
}
|
}
|
||||||
if (moved && mm_cancel) {
|
if (moved && mm_cancel) {
|
||||||
moved = false;
|
moved = false;
|
||||||
restoreSelState();
|
restoreSelState();
|
||||||
hideTmpBuses();
|
hideTmpBuses();
|
||||||
|
m_trace_with_buses = prev_tcb;
|
||||||
}
|
}
|
||||||
if (mm_cancel) return true;
|
if (mm_cancel) return true;
|
||||||
mm_mods = me->modifiers();
|
mm_mods = me->modifiers();
|
||||||
@@ -555,6 +558,7 @@ bool BlockView::eventFilter(QObject * o, QEvent * e) {
|
|||||||
BlockItemPin * pin = getPin(scene_->items(me->scenePos()));
|
BlockItemPin * pin = getPin(scene_->items(me->scenePos()));
|
||||||
if (pin)
|
if (pin)
|
||||||
pin->hoverEnterEvent(0);
|
pin->hoverEnterEvent(0);
|
||||||
|
m_trace_with_buses = prev_tcb;
|
||||||
}
|
}
|
||||||
clearBusStates();
|
clearBusStates();
|
||||||
if (!mm_drag) {
|
if (!mm_drag) {
|
||||||
@@ -1554,7 +1558,6 @@ void BlockView::hideTmpBuses(bool clear) {
|
|||||||
qDeleteAll(tmp_buses);
|
qDeleteAll(tmp_buses);
|
||||||
tmp_buses.clear();
|
tmp_buses.clear();
|
||||||
}
|
}
|
||||||
m_trace_with_buses = prev_tcb;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user