experimental change to the order of operations wrt topify_window in Hud
add _ to TableWindow
This commit is contained in:
parent
1ccbdc5465
commit
c4e2305d82
|
@ -370,7 +370,7 @@ class Hud:
|
||||||
self.label = label
|
self.label = label
|
||||||
menu.show_all()
|
menu.show_all()
|
||||||
self.main_window.show_all()
|
self.main_window.show_all()
|
||||||
self.topify_window(self.main_window)
|
# self.topify_window(self.main_window)
|
||||||
|
|
||||||
def change_max_seats(self, widget):
|
def change_max_seats(self, widget):
|
||||||
if self.max != widget.ms:
|
if self.max != widget.ms:
|
||||||
|
@ -645,6 +645,9 @@ class Hud:
|
||||||
player_id = 'fake',
|
player_id = 'fake',
|
||||||
font = self.font)
|
font = self.font)
|
||||||
|
|
||||||
|
self.topify_window(self.main_window)
|
||||||
|
for i in xrange(1, self.max + 1):
|
||||||
|
self.topify_window(self.stat_windows[i].window, self.main_window)
|
||||||
self.stats = []
|
self.stats = []
|
||||||
game = config.supported_games[self.poker_game]
|
game = config.supported_games[self.poker_game]
|
||||||
|
|
||||||
|
@ -710,13 +713,18 @@ class Hud:
|
||||||
window.window.show_all()
|
window.window.show_all()
|
||||||
unhidewindow = False
|
unhidewindow = False
|
||||||
|
|
||||||
def topify_window(self, window):
|
def topify_window(self, window, parentwindow=None):
|
||||||
window.set_focus_on_map(False)
|
window.set_focus_on_map(False)
|
||||||
window.set_accept_focus(False)
|
window.set_accept_focus(False)
|
||||||
|
# print "topify_window", window, parentwindow
|
||||||
|
|
||||||
if not self.table.gdkhandle:
|
if not self.table.gdkhandle:
|
||||||
self.table.gdkhandle = gtk.gdk.window_foreign_new(int(self.table.number)) # gtk handle to poker window
|
self.table.gdkhandle = gtk.gdk.window_foreign_new(int(self.table.number)) # gtk handle to poker window
|
||||||
|
if parentwindow is not None:
|
||||||
|
window.window.set_transient_for(parentwindow.window)
|
||||||
|
else:
|
||||||
window.window.set_transient_for(self.table.gdkhandle)
|
window.window.set_transient_for(self.table.gdkhandle)
|
||||||
|
window.set_destroy_with_parent(True)
|
||||||
|
|
||||||
class Stat_Window:
|
class Stat_Window:
|
||||||
|
|
||||||
|
@ -791,6 +799,8 @@ class Stat_Window:
|
||||||
self.window.set_focus_on_map(False)
|
self.window.set_focus_on_map(False)
|
||||||
self.window.set_accept_focus(False)
|
self.window.set_accept_focus(False)
|
||||||
|
|
||||||
|
self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_UTILITY)
|
||||||
|
|
||||||
grid = gtk.Table(rows = game.rows, columns = game.cols, homogeneous = False)
|
grid = gtk.Table(rows = game.rows, columns = game.cols, homogeneous = False)
|
||||||
self.grid = grid
|
self.grid = grid
|
||||||
self.window.add(grid)
|
self.window.add(grid)
|
||||||
|
@ -845,20 +855,10 @@ class Stat_Window:
|
||||||
|
|
||||||
|
|
||||||
self.window.move(self.x, self.y)
|
self.window.move(self.x, self.y)
|
||||||
self.window.realize() # window must be realized before it has a gdkwindow so we can attach it to the table window..
|
|
||||||
self.topify_window(self.window)
|
|
||||||
|
|
||||||
self.window.hide()
|
self.window.hide()
|
||||||
|
self.window.realize() # window must be realized before it has a gdkwindow so we can attach it to the table window..
|
||||||
|
# self.topify_window(self.window)
|
||||||
|
|
||||||
def topify_window(self, window):
|
|
||||||
window.set_focus_on_map(False)
|
|
||||||
window.set_accept_focus(False)
|
|
||||||
|
|
||||||
if not self.table.gdkhandle:
|
|
||||||
self.table.gdkhandle = gtk.gdk.window_foreign_new(int(self.table.number)) # gtk handle to poker window
|
|
||||||
# window.window.reparent(self.table.gdkhandle, 0, 0)
|
|
||||||
window.window.set_transient_for(self.table.gdkhandle)
|
|
||||||
# window.present()
|
|
||||||
|
|
||||||
def destroy(*args): # call back for terminating the main eventloop
|
def destroy(*args): # call back for terminating the main eventloop
|
||||||
gtk.main_quit()
|
gtk.main_quit()
|
||||||
|
|
|
@ -26,6 +26,9 @@ client has been resized, destroyed, etc.
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
|
import L10n
|
||||||
|
_ = L10n.get_translation()
|
||||||
|
|
||||||
# Standard Library modules
|
# Standard Library modules
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
@ -66,7 +69,7 @@ bad_words = ('History for table:', 'HUD:', 'Chat:', 'FPDBHUD')
|
||||||
|
|
||||||
# Here are the custom signals we define for allowing the 'client watcher'
|
# Here are the custom signals we define for allowing the 'client watcher'
|
||||||
# thread to communicate with the gui thread. Any time a poker client is
|
# thread to communicate with the gui thread. Any time a poker client is
|
||||||
# is moved, resized, or closed on of these signals is emitted to the
|
# is moved, resized, or closed one of these signals is emitted to the
|
||||||
# HUD main window.
|
# HUD main window.
|
||||||
gobject.signal_new("client_moved", gtk.Window,
|
gobject.signal_new("client_moved", gtk.Window,
|
||||||
gobject.SIGNAL_RUN_LAST,
|
gobject.SIGNAL_RUN_LAST,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user