Minor fixes

Kozea · Aug 3, 2015 · 3d45233 · 3d45233
1 parent 0ddcc0d
commit 3d45233
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -14,6 +14,7 @@ Changelog
 * Activate element on tooltip hovering. (#106)
 * Fix radar axis behaviour (#247)
 * Add tooltip support in metadata to add a title (#249).
+* Take config class options in account too.
 
 
 2.0.0

diff --git a/pygal/graph/dual.py b/pygal/graph/dual.py
@@ -39,7 +39,7 @@ def _compute_x_labels(self):
                     pos = float(x_label.get('value'))
                     title = x_label.get('label', self._format(pos))
                 elif is_str(x_label):
-                    pos = x_pos[i]
+                    pos = x_pos[i % len(x_pos)]
                     title = x_label
                 else:
                     pos = self._x_adapt(float(x_label))

diff --git a/pygal/graph/graph.py b/pygal/graph/graph.py
@@ -761,7 +761,7 @@ def _compute_y_labels(self):
                     pos = float(y_label.get('value'))
                     title = y_label.get('label', self._format(pos))
                 elif is_str(y_label):
-                    pos = y_pos[i]
+                    pos = y_pos[i % len(y_pos)]
                     title = y_label
                 else:
                     pos = float(y_label)

diff --git a/pygal/state.py b/pygal/state.py
@@ -30,6 +30,7 @@ class State(object):
 
     def __init__(self, graph, **kwargs):
         """Create the transient state"""
+        self.__dict__.update(**graph.config.__class__.__dict__)
         self.__dict__.update(**graph.config.__dict__)
         self.__dict__.update(**graph.__dict__)
         self.__dict__.update(**kwargs)