copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

place roster tooltips correctly.

Browse source
This commit is contained in:
Yann Leboulanger 2015-08-15 22:16:45 +02:00
parent b8c90a2750
commit f69ade130c
2 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/roster_window.py
View file

@ -4114,7 +4114,7 @@ class RosterWindow:
self.tree.expand_row(path, False) self.tree.expand_row(path, False)
return return
if self.rfilter_enabled: if self.rfilter_enabled:
Gobject.idle_add(self.disable_rfilter) GObject.idle_add(self.disable_rfilter)
jid = model[path][C_JID] jid = model[path][C_JID]
resource = None resource = None
contact = gajim.contacts.get_contact_with_highest_priority(account, jid) contact = gajim.contacts.get_contact_with_highest_priority(account, jid)

54
src/tooltips.py
View file

@ -73,6 +73,7 @@ class BaseTooltip:
self.cur_data = None self.cur_data = None
self.check_last_time = None self.check_last_time = None
self.shown = False self.shown = False
self.position_computed = False
def populate(self, data): def populate(self, data):
""" """
@ -115,30 +116,36 @@ class BaseTooltip:
self.hide_tooltip() self.hide_tooltip()
def on_size_allocate(self, widget, rect): def on_size_allocate(self, widget, rect):
half_width = rect.width / 2 + 1 if not self.position_computed:
if self.preferred_position[1] + rect.height > self.screen.get_height(): half_width = rect.width / 2 + 1
# flip tooltip up if self.preferred_position[1] + rect.height > \
self.preferred_position[1] -= rect.height + self.widget_height + 8 self.screen.get_height():
if self.preferred_position[1] < 0: # flip tooltip up
self.preferred_position[1] = self.screen.get_height() - \ self.preferred_position[1] -= rect.height + self.widget_height \
rect.height - 2 + 8
if self.preferred_position[1] < 0:
self.preferred_position[1] = self.screen.get_height() - \
rect.height - 2
if self.preferred_position[0] + rect.width + 7 < \ if self.preferred_position[0] + rect.width + 7 < \
self.screen.get_width(): self.screen.get_width():
self.preferred_position[0] = self.preferred_position[0] + 7 self.preferred_position[0] = self.preferred_position[0]\
else: + 7
self.preferred_position[0] = self.preferred_position[0] - \ else:
rect.width - 7 self.preferred_position[0] = self.preferred_position[0]\
self.win.move(self.preferred_position[0], - rect.width - 7
self.preferred_position[1]) self.win.move(self.preferred_position[0],
return self.preferred_position[1])
if self.preferred_position[0] < half_width: return
self.preferred_position[0] = 0 if self.preferred_position[0] < half_width:
elif self.preferred_position[0] + rect.width > \ self.preferred_position[0] = 0
self.screen.get_width() + half_width: elif self.preferred_position[0] + rect.width > \
self.preferred_position[0] = self.screen.get_width() - rect.width self.screen.get_width() + half_width:
elif not self.check_last_time: self.preferred_position[0] = self.screen.get_width() - \
self.preferred_position[0] -= half_width rect.width
elif not self.check_last_time:
self.preferred_position[0] -= half_width
self.position_computed = True
self.win.move(self.preferred_position[0], self.preferred_position[1]) self.win.move(self.preferred_position[0], self.preferred_position[1])
def show_tooltip(self, data, widget_height, widget_y_position): def show_tooltip(self, data, widget_height, widget_y_position):
@ -151,6 +158,7 @@ class BaseTooltip:
""" """
if self.shown: if self.shown:
return return
self.position_computed = False
self.cur_data = data self.cur_data = data
# set tooltip contents # set tooltip contents
self.populate(data) self.populate(data)