From a0368054cc38c46c343499aebe38050d69df2cd3 Mon Sep 17 00:00:00 2001
From: Simon Poirier <simpoir@gmail.com>
Date: Sat, 24 Oct 2009 21:25:46 +0000
Subject: merge creator

Conflicts:

	tutorius/core.py
---
(limited to 'tutorius/viewer.py')

diff --git a/tutorius/viewer.py b/tutorius/viewer.py
index e0ae4a9..751e89a 100644
--- a/tutorius/viewer.py
+++ b/tutorius/viewer.py
@@ -179,7 +179,7 @@ class Viewer(object):
             if event_list:
                 local_height = (block_max_height - BLOCK_PADDING)/len(event_list) - BLOCK_PADDING
                 ctx.save()
-                for event in event_list:
+                for event, next_state in event_list:
                     origin = tuple(ctx.get_matrix())[-2:]
                     if self.click_pos and \
                        self.click_pos[0]-BLOCK_WIDTH<origin[0] and \
@@ -193,7 +193,7 @@ class Viewer(object):
 
                 # FIXME point to next state in state, as it would highlight
                 # the "happy path".
-                cur_state = event_list[0].get_next_state()
+                cur_state = event_list[0][1]
 
             if (not new_insert_point) and self.click_pos:
                 origin = tuple(ctx.get_matrix())[-2:]
--
cgit v0.9.1