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

add proper returns for our mouse-button callbacks in HUD, also trap events for focus change, which doesn't entirely solve the focus issues, but does lessen them for me

Browse Source
This commit is contained in:
Eric Blade 2009-08-19 05:59:44 -05:00
parent 9f89340881
commit fafbda8053
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pyfpdb/Hud.py
View File

@ -402,9 +402,11 @@ class Stat_Window:
if event.button == 3: # right button event if event.button == 3: # right button event
self.popups.append(Popup_window(widget, self)) self.popups.append(Popup_window(widget, self))
return True
if event.button == 2: # middle button event if event.button == 2: # middle button event
self.window.hide() self.window.hide()
return True
if event.button == 1: # left button event if event.button == 1: # left button event
# TODO: make position saving save sizes as well? # TODO: make position saving save sizes as well?
@ -412,7 +414,12 @@ class Stat_Window:
self.window.begin_resize_drag(gtk.gdk.WINDOW_EDGE_SOUTH_EAST, event.button, int(event.x_root), int(event.y_root), event.time) self.window.begin_resize_drag(gtk.gdk.WINDOW_EDGE_SOUTH_EAST, event.button, int(event.x_root), int(event.y_root), event.time)
else: else:
self.window.begin_move_drag(event.button, int(event.x_root), int(event.y_root), event.time) self.window.begin_move_drag(event.button, int(event.x_root), int(event.y_root), event.time)
return True
return False
def noop(self): # i'm going to try to connect the focus-in and focus-out events here, to see if that fixes any of the focus problems.
return True
def kill_popup(self, popup): def kill_popup(self, popup):
popup.window.destroy() popup.window.destroy()
self.popups.remove(popup) self.popups.remove(popup)
@ -487,9 +494,16 @@ class Stat_Window:
e_box[r][c].add(self.label[r][c]) e_box[r][c].add(self.label[r][c])
e_box[r][c].connect("button_press_event", self.button_press_cb) e_box[r][c].connect("button_press_event", self.button_press_cb)
e_box[r][c].connect("focus-in-event", self.noop)
e_box[r][c].connect("focus", self.noop)
e_box[r][c].connect("focus-out-event", self.noop)
label[r][c].modify_font(font) label[r][c].modify_font(font)
self.window.set_opacity(parent.colors['hudopacity']) self.window.set_opacity(parent.colors['hudopacity'])
self.window.connect("focus", self.noop)
self.window.connect("focus-in-event", self.noop)
self.window.connect("focus-out-event", self.noop)
self.window.connect("button_press_event", self.button_press_cb)
self.window.move(self.x, self.y) self.window.move(self.x, self.y)
@ -590,7 +604,9 @@ class Popup_window:
if event.button == 3: # right button event if event.button == 3: # right button event
self.stat_window.kill_popup(self) self.stat_window.kill_popup(self)
return True
# self.window.destroy() # self.window.destroy()
return False
def toggle_decorated(self, widget): def toggle_decorated(self, widget):
top = widget.get_toplevel() top = widget.get_toplevel()