From 01bc1cebf1be37a3714a757ff96fc6114447e19f Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 25 Mar 2009 16:46:06 -0400 Subject: [PATCH] Fix numerous typos/bugs in previous commit. --- pyfpdb/Hud.py | 4 ++-- pyfpdb/Mucked.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index db665d57..caf4ebb2 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -178,7 +178,8 @@ class Hud: if not type(w) == int: # how do we get pure ints in this list?? (x, y) = loc[adj[i]] w.relocate(x, y) - + [aw.relocate(self.table.x, self.table.y) for aw in self.aux_windows] + return True def on_button_press(self, widget, event): @@ -204,7 +205,6 @@ class Hud: def reposition_windows(self, *args): if self.stat_windows != {} and len(self.stat_windows) > 0: (x.window.move(x.x, x.y) for x in self.stat_windows.itervalues() if type(x) != int) - [aw.relocate(self.hud.x, self.hud.y) for aw in self.aux_windows] return True def debug_stat_windows(self, *args): diff --git a/pyfpdb/Mucked.py b/pyfpdb/Mucked.py index 7df73e2b..434ef63b 100755 --- a/pyfpdb/Mucked.py +++ b/pyfpdb/Mucked.py @@ -440,12 +440,14 @@ class Flop_Mucked(Aux_Window): def configure_event_cb(self, widget, event, i, *args): self.positions[i] = widget.get_position() - self.rel_positions[i] = (self.positions[i][0] - hud.table.x, self.positions[i][1] - hud.table.y) + self.rel_positions[i] = (self.positions[i][0] - self.hud.table.x, self.positions[i][1] - self.hud.table.y) def relocate(self, x, y): for i, w in self.m_windows.iteritems(): - self.positons[i] = (x + self.rel_positions[i][0], y + self.rel_positions[i][1]) - self.m_windows.move(self.positions[i]) + self.positions[i] = (x + self.rel_positions[i][0], y + self.rel_positions[i][1]) + print "x, y =", x, y + print "rel_pos =", self.rel_positions + w.move(self.positions[i][0], self.positions[i][0]) def expose_all(self): for (i, cards) in self.hud.cards.iteritems():