diff options
author | Dan Williams <dcbw@localhost.localdomain> | 2006-09-25 01:37:46 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@localhost.localdomain> | 2006-09-25 01:37:46 (GMT) |
commit | e2f82f02a0b394c81347953f86c0175bc63cda70 (patch) | |
tree | 8e3dae368450d3cc5f7cf756986c84e7806457a4 /sugar | |
parent | 701cef3f1d6697651e20a2146f62e7dda7b2dd7e (diff) | |
parent | bcd150fa81ac06c4680ce022fc85919850c0f6fd (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Conflicts:
shell/view/home/IconLayout.py
Diffstat (limited to 'sugar')
-rw-r--r-- | sugar/canvas/Grid.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sugar/canvas/Grid.py b/sugar/canvas/Grid.py index 3d586dd..70bafa3 100644 --- a/sugar/canvas/Grid.py +++ b/sugar/canvas/Grid.py @@ -31,6 +31,10 @@ class Grid: return [grid_x, grid_y] + def convert_to_canvas(self, grid_x, grid_y): + scale = 1200 / Grid.COLS + return [grid_x * scale, grid_y * scale] + def set_constraints(self, component, x, y, width=-1, height=-1): if isinstance(component, gtk.Window): self._layout_window(component, x, y, width, height) |