Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--sugar/graphics/menushell.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index f17f720..9f2dd08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.36],[],[sugar])
+AC_INIT([Sugar],[0.37],[],[sugar])
AC_PREREQ([2.59])
diff --git a/sugar/graphics/menushell.py b/sugar/graphics/menushell.py
index c99db00..48183e1 100644
--- a/sugar/graphics/menushell.py
+++ b/sugar/graphics/menushell.py
@@ -92,10 +92,10 @@ class MenuShell(gobject.GObject):
if x + menu_w > gtk.gdk.screen_width():
[x, y] = [left_x, left_y]
- x = min(x, gtk.gdk.screen_width())
+ x = min(x, gtk.gdk.screen_width() - menu_w)
x = max(0, x)
- y = min(y, gtk.gdk.screen_height())
+ y = min(y, gtk.gdk.screen_height() - menu_h)
y = max(0, y)
return [x, y]