Commits

Yuya Nishihara committed 7cc9ac8

fin

  • Participants
  • Parent commits 3f887b1

Comments (0)

Files changed (3)

graphdele-roleref.diff

-# HG changeset patch
-# Date 1395570625 -32400
-# Parent cff6016cd7d8bfef4cb675b1fe223869a608cc85
-
-diff --git a/tortoisehg/hgqt/repoview.py b/tortoisehg/hgqt/repoview.py
---- a/tortoisehg/hgqt/repoview.py
-+++ b/tortoisehg/hgqt/repoview.py
-@@ -413,9 +413,6 @@ class HgRepoViewStyle(QStyle):
-         return self._style.standardIconImplementation(*args)
- 
- 
--GraphNodeRole = repomodel.GraphNodeRole
--get_color = repomodel.get_color
--
- def get_style(line_type, active):
-     if line_type == graph.LINE_TYPE_GRAFT:
-         return Qt.DashLine
-@@ -432,7 +429,7 @@ def _edge_color(edge, active):
-     if not active or edge.linktype == graph.LINE_TYPE_FAMILY:
-         return "gray"
-     else:
--        return get_color(edge.color)
-+        return repomodel.get_color(edge.color)
- 
- 
- class GraphDelegate(QStyledItemDelegate):
-@@ -458,7 +455,7 @@ class GraphDelegate(QStyledItemDelegate)
-         return maxradius * (col + 1)
- 
-     def graphctx(self, index):
--        gnode = index.data(GraphNodeRole).toPyObject()
-+        gnode = index.data(repomodel.GraphNodeRole).toPyObject()
-         w = self.col2x(gnode.cols)
-         h = self.rowheight
- 

graphdele-sizehint.diff

-# HG changeset patch
-# Date 1395569831 -32400
-# Parent f710683dbe4fc763d6bead8cccb203d69d47b382
-
-diff --git a/tortoisehg/hgqt/repoview.py b/tortoisehg/hgqt/repoview.py
---- a/tortoisehg/hgqt/repoview.py
-+++ b/tortoisehg/hgqt/repoview.py
-@@ -593,9 +593,9 @@ class GraphDelegate(QStyledItemDelegate)
-             circle(symbolsize)
- 
-     def sizeHint(self, option, index):
--        graph = self.graphctx(index)
--        if graph:
--            return QPixmap(graph).size()
-+        gnode = index.data(repomodel.GraphNodeRole).toPyObject()
-+        if gnode:
-+            return QSize(self.col2x(gnode.cols), self.rowheight)
-         else:
-             return QSize(0, 0)
- 
-graphdele-roleref.diff
-graphdele-sizehint.diff
 graphdele-paintdirect.diff
 graphdele-shadow-exp.diff
 graphdele-overpaint-exp.diff