Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--shell/view/home/spreadlayout.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5dc2c15..1e86203 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* #4667 Do not display XO outside the mesh view. (marco)
* #4687 Use the right free function, fix a crash. (sjoerd)
* #4724 Display meshbox invite palette menu with colored
activity icon (erikos)
diff --git a/shell/view/home/spreadlayout.py b/shell/view/home/spreadlayout.py
index 91ebfef..3edd717 100644
--- a/shell/view/home/spreadlayout.py
+++ b/shell/view/home/spreadlayout.py
@@ -22,6 +22,8 @@ import hippo
import gobject
import gtk
+from sugar.graphics import style
+
_PLACE_TRIALS = 20
_MAX_WEIGHT = 255
_CELL_SIZE = 4
@@ -208,7 +210,7 @@ class SpreadLayout(gobject.GObject, hippo.CanvasLayout):
self._box = box
def do_get_height_request(self, for_width):
- return 0, gtk.gdk.screen_height()
+ return 0, gtk.gdk.screen_height() - style.GRID_CELL_SIZE
def do_get_width_request(self):
return 0, gtk.gdk.screen_width()