comparison grapher.h @ 153:70fe12873106

* Show both parents of uncommitted merge; fixes to right-button menus

 class Grapher
 {
 public:
     Grapher(ChangesetScene *scene) { m_scene = scene; }
 
-    void layout(Changesets csets, QString uncommittedSproutsFrom = "");
+    void layout(Changesets csets,
+                QStringList uncommittedParents,
+                QString uncommittedBranch);
 
     ChangesetItem *getItemFor(Changeset *cs);
 
     UncommittedItem *getUncommittedItem() { return m_uncommitted; }
 

     IdSet m_handled;
 
     typedef QMap<int, QString> RowDateMap;
     RowDateMap m_rowDates;
 
-    QString m_uncommittedParentId;
+    QStringList m_uncommittedParents;
     int m_uncommittedParentRow;
     UncommittedItem *m_uncommitted;
     bool m_haveAllocatedUncommittedColumn;
 
     void layoutRow(QString id);