Ticket #610: palette-width.patch

src/sugar/graphics/palette.py

@@ -145 +145 @@
     # DEPRECATED: label is passed with the primary-text property, accel_path 
     # is set via the invoker property, and menu_after_content is not used
     def __init__(self, label=None, accel_path=None, menu_after_content=False,
-                 text_maxlen=0, **kwargs):
+                 text_maxlen=999, **kwargs):
 
         self.palette_state = self.PRIMARY
 
@@ -178 +178 @@
         self._label = gtk.AccelLabel('')
         self._label.set_alignment(0, 0.5)
 
+        # The text_maxlen parameter defaults to 999. The reason for this is
+        # that the label will then request the correct size, while at the same
+        # time being able tel ellipsize correctly. Not setting maxlen would
+        # mean that the label requests a very small area, and the palette would
+        # not be wide enough.
+        # The size of the palette is clamped in do_size_request.
         if text_maxlen > 0:
             self._label.set_max_width_chars(text_maxlen)
             self._label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
@@ -467 +473 @@
                                 label_width,
                                 self._full_request[0])
 
+        screen = self.get_screen()
+        screen_width = screen.get_width()
+        # Maximum width is two third of the screens width
+        requisition.width = min(requisition.width, screen_width * 2 / 3)
+
     def do_size_allocate(self, allocation):
         gtk.Window.do_size_allocate(self, allocation)