comparison src/grapher.cpp @ 388:6718bbc073b4 item_appearance_adjustments

Fix Z value of connecting item from uncommitted changes
author Chris Cannam
date Tue, 24 May 2011 16:26:42 +0100
parents f051d210521e
children 61bde1f0ff0a
comparison
equal deleted inserted replaced
387:ce6a70970808 388:6718bbc073b4
450 ConnectionItem *conn = new ConnectionItem(); 450 ConnectionItem *conn = new ConnectionItem();
451 conn->setConnectionType(ConnectionItem::Merge); 451 conn->setConnectionType(ConnectionItem::Merge);
452 ChangesetItem *pitem = m_items[p]; 452 ChangesetItem *pitem = m_items[p];
453 conn->setParent(pitem); 453 conn->setParent(pitem);
454 conn->setChild(m_uncommitted); 454 conn->setChild(m_uncommitted);
455 conn->setZValue(0); 455 conn->setZValue(-1);
456 m_scene->addItem(conn); 456 m_scene->addItem(conn);
457 if (pitem) { 457 if (pitem) {
458 if (pitem->getChangeset()->branch() == uncommittedBranch) { 458 if (pitem->getChangeset()->branch() == uncommittedBranch) {
459 haveParentOnBranch = true; 459 haveParentOnBranch = true;
460 } 460 }