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

Don't add a label on RadioToolButton when set icon_widget - Fixes #4875

Browse Source 
When we use set_icon_widget(), GtkToolButton set a private property
contents_invalid = TRUE [1], and gtk_tool_button_construct_content [2]
is called. Then if the label widget not exist, a GtkLabel is added.
This is a problem for us, by example in the Clipboard buttons in the frame.
By adding a empty Gtk.Box instead of a label, we avoid the label creation.

But as this is a internal implementation of Gtk, can change in the future,
in fact the issue is not visible with Gtk < 3.16

This patch is based in a pr sent by Sam Parkinson

[1] https://github.com/GNOME/gtk/blob/master/gtk/gtktoolbutton.c#L1415
[2] https://github.com/GNOME/gtk/blob/master/gtk/gtktoolbutton.c#L357
This commit is contained in:
Gonzalo Odiard 2015-07-08 12:09:07 -03:00
parent f215d20508
commit 7a3d23e2b6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sugar3/graphics/radiotoolbutton.py
View File

@ -48,6 +48,11 @@ class RadioToolButton(Gtk.RadioToolButton):
if icon_name: if icon_name:
self.set_icon_name(icon_name) self.set_icon_name(icon_name)
# HACK: stop Gtk from adding a label and expanding the size of
# the button. This happen when set_icon_widget is called
# if label_widget is None
self.props.label_widget = Gtk.Box()
self.connect('destroy', self.__destroy_cb) self.connect('destroy', self.__destroy_cb)
def __destroy_cb(self, icon): def __destroy_cb(self, icon):