Fix out of screen computation. Release 0.37

18 years ago · e098bdf8eb
parent 6c375a20f3
commit e098bdf8eb
2 changed files with 3 additions and 3 deletions
--- 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])

--- 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]