diff options
| -rw-r--r-- | shell/FriendIcon.py | 2 | ||||
| -rw-r--r-- | sugar/canvas/Grid.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/shell/FriendIcon.py b/shell/FriendIcon.py index eb2cf9d..8d1017c 100644 --- a/shell/FriendIcon.py +++ b/shell/FriendIcon.py @@ -58,7 +58,7 @@ class FriendIcon(IconItem): grid_x = grid_x2 + distance if grid_x + self._popup.get_width() > Grid.ROWS: - grid_x = grid_x1 - self._popup.get_width() - distance + grid_x = grid_x1 - self._popup.get_width() + 1 - distance grid_y = grid_y1 diff --git a/sugar/canvas/Grid.py b/sugar/canvas/Grid.py index e4c377a..50b5dbe 100644 --- a/sugar/canvas/Grid.py +++ b/sugar/canvas/Grid.py @@ -10,7 +10,11 @@ class Grid: def convert_from_screen(self, x, y): factor = Grid.COLS / gtk.gdk.screen_width() - return [int(x * factor), int(y * factor)] + + grid_x = round(x * factor) - 1 + grid_y = round(y * factor) - 1 + + return [grid_x, grid_y] def set_constraints(self, component, x, y, width=-1, height=-1): if isinstance(component, gtk.Window): |