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

Do not calculate palette height on PaletteWindowWidget - Fixes #4792

Browse Source 
To solve ticket #4673, we calculate the palette size using the size
of all the widgets [2]. That solves the problem on Palettes based on
_PaletteMenuWidget but on _PaletteWindowWidget produce a wrong value
when the secondary_label is not null, and as a consequence
the palette position is wrong.
The solution is do the calculation only for _PaletteMenuWidget based
palettes.

[1] https://bugs.sugarlabs.org/ticket/4673
[2] b9d6b628a9
This commit is contained in:
Gonzalo Odiard 2015-08-07 12:58:07 -03:00
parent e990ec7703
commit 9314fd89fa
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,18 +621,19 @@ class PaletteWindow(GObject.GObject):
return return
req = self._widget.size_request() req = self._widget.size_request()
# on Gtk 3.10, menu at the bottom of the screen are resized if isinstance(self._widget, _PaletteMenuWidget):
# to not fall out, and report a wrong size. # on Gtk 3.10, menu at the bottom of the screen are resized
# measure the children and move the menu - SL #4673 # to not fall out, and report a wrong size.
total_height = 0 # measure the children and move the menu - SL #4673
for child in self._widget.get_children(): total_height = 0
child_req = child.size_request() for child in self._widget.get_children():
total_height += child_req.height child_req = child.size_request()
total_height += child_req.height
# need add the border line width as defined in sugar-artwork # need add the border line width as defined in sugar-artwork
line_width = 2 line_width = 2
total_height += line_width * 2 total_height += line_width * 2
req.height = total_height req.height = total_height
position = invoker.get_position_for_alignment(self._alignment, req) position = invoker.get_position_for_alignment(self._alignment, req)
if position is None: if position is None: