sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show palettes at the screen bottom with the right size - Fixes #4673

Browse Source 
On Gtk 3.10, Gtk.Menu at the bottom of the screen are resized
to avoid fall out of the screen, then report a wrong height.
We need calculate the size of the children and move the Menu up.

This problem is visible on the Clipboard icon palettes,
and in journal objects palettes at the bottom of the screen.

This patch also rename a variable 'rect' to 'req', because is
a Requisition (width, height) and not a Rectangle (x, y, width, height).

Finally, to avoid a error with the secondary text on the palette,
when copy text from the terminal, reove the '¬r' character.

Signed-off-by: Gonzalo Odiard <godiard@sugarlabs.org>
This commit is contained in:
Gonzalo Odiard 2014-05-28 10:00:05 -03:00 committed by Martin Abente Lahaye
parent f157b1148e
commit b9d6b628a9
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sugar3/graphics/palette.py
View File

@ -276,6 +276,7 @@ class Palette(PaletteWindow):
ELLIPSIS_LENGTH = 6 ELLIPSIS_LENGTH = 6
label = label.replace('\n', ' ') label = label.replace('\n', ' ')
label = label.replace('\r', ' ')
self._secondary_label.modify_fg(Gtk.StateType.INSENSITIVE, self._secondary_label.modify_fg(Gtk.StateType.INSENSITIVE,
Gdk.color_parse('white')) Gdk.color_parse('white'))

15
src/sugar3/graphics/palettewindow.py
View File

@ -612,10 +612,19 @@ class PaletteWindow(GObject.GObject):
logging.error('Cannot update the palette position.') logging.error('Cannot update the palette position.')
return return
rect = self._widget.size_request() req = self._widget.size_request()
position = invoker.get_position_for_alignment(self._alignment, rect) # on Gtk 3.10, menu at the bottom of the screen are resized
# to not fall out, and report a wrong size.
# measure the children and move the menu - SL #4673
total_height = 0
for child in self._widget.get_children():
child_req = child.size_request()
total_height += child_req.height
req.height = total_height
position = invoker.get_position_for_alignment(self._alignment, req)
if position is None: if position is None:
position = invoker.get_position(rect) position = invoker.get_position(req)
self._widget.move(position.x, position.y) self._widget.move(position.x, position.y)