evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflicts between ray's new window move code and my old window move code

Browse Source 
Ray: when you finish implementing yours, please adapt and/or disable Hud::update_table_position
This commit is contained in:
Eric Blade 2010-09-27 04:04:56 -04:00
parent a98e71ad24
commit 4b3fe3dfa2
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pyfpdb/Hud.py
View File

@ -472,17 +472,19 @@ class Hud:
return False return False
# anyone know how to do this in unix, or better yet, trap the X11 error that is triggered when executing the get_origin() for a closed window? # anyone know how to do this in unix, or better yet, trap the X11 error that is triggered when executing the get_origin() for a closed window?
if self.table.gdkhandle is not None: if self.table.gdkhandle is not None:
(x, y) = self.table.gdkhandle.get_origin() # In Windows, this call returns (0,0) if it's an invalid window. In X, the X server is immediately killed. (oldx, oldy) = self.table.gdkhandle.get_origin() # In Windows, this call returns (0,0) if it's an invalid window. In X, the X server is immediately killed.
if self.table.x != x or self.table.y != y: # If the current position does not equal the stored position, save the new position, and then move all the sub windows. #(x, y, width, height) = self.table.get_geometry()
self.table.x = x #print "self.table.get_geometry=",x,y,width,height
self.table.y = y if self.table.oldx != oldx or self.table.oldy != oldy: # If the current position does not equal the stored position, save the new position, and then move all the sub windows.
self.main_window.move(x + self.site_params['xshift'], y + self.site_params['yshift']) self.table.oldx = oldx
self.table.oldy = oldy
self.main_window.move(oldx + self.site_params['xshift'], oldy + self.site_params['yshift'])
adj = self.adj_seats(self.hand, self.config) adj = self.adj_seats(self.hand, self.config)
loc = self.config.get_locations(self.table.site, self.max) loc = self.config.get_locations(self.table.site, self.max)
# TODO: is stat_windows getting converted somewhere from a list to a dict, for no good reason? # TODO: is stat_windows getting converted somewhere from a list to a dict, for no good reason?
for i, w in enumerate(self.stat_windows.itervalues()): for i, w in enumerate(self.stat_windows.itervalues()):
(x, y) = loc[adj[i+1]] (oldx, oldy) = loc[adj[i+1]]
w.relocate(x, y) w.relocate(oldx, oldy)
# While we're at it, fix the positions of mucked cards too # While we're at it, fix the positions of mucked cards too
for aux in self.aux_windows: for aux in self.aux_windows:

3
pyfpdb/TableWindow.py
View File

@ -141,6 +141,8 @@ class Table_Window(object):
self.height = geo['height'] self.height = geo['height']
self.x = geo['x'] self.x = geo['x']
self.y = geo['y'] self.y = geo['y']
self.oldx = self.x # attn ray: remove these two lines and update Hud.py::update_table_position()
self.oldy = self.y
self.game = self.get_game() self.game = self.get_game()
@ -238,6 +240,7 @@ class Table_Window(object):
return "client_destroyed" return "client_destroyed"
if self.x != new_geo['x'] or self.y != new_geo['y']: # window moved if self.x != new_geo['x'] or self.y != new_geo['y']: # window moved
print self.x, self.y, new_geo['x'], new_geo['y']
self.x = new_geo['x'] self.x = new_geo['x']
self.y = new_geo['y'] self.y = new_geo['y']
return "client_moved" return "client_moved"

1
pyfpdb/WinTables.py
View File

@ -80,6 +80,7 @@ class Table(Table_Window):
try: try:
(x, y, width, height) = win32gui.GetWindowRect(self.number) (x, y, width, height) = win32gui.GetWindowRect(self.number)
#print "x=",x,"y=",y,"width=",width,"height=",height
width = width - x width = width - x
height = height - y height = height - y
return {'x' : int(x) + b_width, return {'x' : int(x) + b_width,