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

Fix icon size in ColorButton

Browse Source 
ColorButton did not show button icon, and swatches were too small
making it almost unusable. Color chooser toolbar had been using
Gtk.IconSize.LARGE_TOOLBAR which return 0 as size.
style.GRID_CELL_SIZE was used as size reference
This commit is contained in:
Srevin Saju 2020-01-18 23:30:29 +03:00 committed by James Cameron
parent 39b12bbf7f
commit 6fc675e848
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sugar3/graphics/colorbutton.py
View File

@ -66,7 +66,7 @@ class _ColorButton(Gtk.Button):
self._accept_drag = True self._accept_drag = True
self._preview = Icon(icon_name='color-preview', self._preview = Icon(icon_name='color-preview',
pixel_size=style.SMALL_ICON_SIZE) pixel_size=style.STANDARD_ICON_SIZE)
GObject.GObject.__init__(self, **kwargs) GObject.GObject.__init__(self, **kwargs)
@ -359,7 +359,7 @@ class _ColorPalette(Palette):
button = _ColorButton(has_palette=False, button = _ColorButton(has_palette=False,
color=Gdk.color_parse(color), color=Gdk.color_parse(color),
accept_drag=False, accept_drag=False,
icon_size=Gtk.IconSize.LARGE_TOOLBAR) icon_size=style.STANDARD_ICON_SIZE)
button.set_relief(Gtk.ReliefStyle.NONE) button.set_relief(Gtk.ReliefStyle.NONE)
self._swatch_tray.attach(button, self._swatch_tray.attach(button,
i % rows, i % rows + 1, i % rows, i % rows + 1,
@ -476,7 +476,7 @@ class ColorToolButton(Gtk.ToolItem):
# The following is so that the behaviour on the toolbar is correct. # The following is so that the behaviour on the toolbar is correct.
color_button.set_relief(Gtk.ReliefStyle.NONE) color_button.set_relief(Gtk.ReliefStyle.NONE)
color_button.icon_size = Gtk.IconSize.LARGE_TOOLBAR color_button.icon_size = style.STANDARD_ICON_SIZE
self._palette_invoker.attach_tool(self) self._palette_invoker.attach_tool(self)
self._palette_invoker.props.toggle_palette = True self._palette_invoker.props.toggle_palette = True