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

Fix the drawing of ColorToolButton, RadioToolButton and ToggleToolButton

Browse Source 
gtk_paint_box is deprecated [1] and now we can use the CSS to change
the style of the button's prelight state.

To test the buttons, I provide a patch for HelloWorld activity [2].
They are added in the main toolbar.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>

[1] http://developer.gnome.org/gtk3/stable/GtkStyle.html#gtk-paint-box
[2] http://dev.laptop.org/~manuq/shell-port/test_gtk3_buttons.patch
This commit is contained in:
Manuel Quiñones 2012-08-23 02:12:29 -03:00 committed by Simon Schampijer
parent e2ddd70c13
commit 1e6cba8474
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,20 +523,14 @@ class ColorToolButton(Gtk.ToolItem):
title = GObject.property(type=str, getter=get_title, setter=set_title) title = GObject.property(type=str, getter=get_title, setter=set_title)
def do_expose_event(self, event): def do_draw(self, cr):
child = self.get_child() child = self.get_child()
allocation = self.get_allocation() allocation = self.get_allocation()
if self._palette and self._palette.is_up(): if self._palette and self._palette.is_up():
invoker = self._palette.props.invoker invoker = self._palette.props.invoker
invoker.draw_rectangle(event, self._palette) invoker.draw_rectangle(cr, self._palette)
elif child.state == Gtk.StateType.PRELIGHT:
child.style.paint_box(event.window, Gtk.StateType.PRELIGHT,
Gtk.ShadowType.NONE, event.area,
child, 'toolbutton-prelight',
allocation.x, allocation.y,
allocation.width, allocation.height)
Gtk.ToolButton.do_expose_event(self, event) Gtk.ToolButton.do_draw(self, cr)
def __notify_change(self, widget, pspec): def __notify_change(self, widget, pspec):
self.notify(pspec.name) self.notify(pspec.name)

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

@ -165,18 +165,12 @@ class RadioToolButton(Gtk.RadioToolButton):
palette_invoker = GObject.property( palette_invoker = GObject.property(
type=object, setter=set_palette_invoker, getter=get_palette_invoker) type=object, setter=set_palette_invoker, getter=get_palette_invoker)
def do_expose_event(self, event): def do_draw(self, cr):
child = self.get_child() child = self.get_child()
allocation = self.get_allocation() allocation = self.get_allocation()
if self.palette and self.palette.is_up(): if self.palette and self.palette.is_up():
invoker = self.palette.props.invoker invoker = self.palette.props.invoker
invoker.draw_rectangle(event, self.palette) invoker.draw_rectangle(cr, self.palette)
elif child.state == Gtk.StateType.PRELIGHT:
child.style.paint_box(event.window, Gtk.StateType.PRELIGHT,
Gtk.ShadowType.NONE, event.area,
child, 'toolbutton-prelight',
allocation.x, allocation.y,
allocation.width, allocation.height)
Gtk.RadioToolButton.do_expose_event(self, event) Gtk.RadioToolButton.do_draw(self, cr)

12
src/sugar3/graphics/toggletoolbutton.py
View File

@ -113,20 +113,14 @@ class ToggleToolButton(Gtk.ToggleToolButton):
accelerator = GObject.property(type=str, setter=set_accelerator, accelerator = GObject.property(type=str, setter=set_accelerator,
getter=get_accelerator) getter=get_accelerator)
def do_expose_event(self, event): def do_draw(self, cr):
allocation = self.get_allocation() allocation = self.get_allocation()
child = self.get_child() child = self.get_child()
if self.palette and self.palette.is_up(): if self.palette and self.palette.is_up():
invoker = self.palette.props.invoker invoker = self.palette.props.invoker
invoker.draw_rectangle(event, self.palette) invoker.draw_rectangle(cr, self.palette)
elif child.state == Gtk.StateType.PRELIGHT:
child.style.paint_box(event.window, Gtk.StateType.PRELIGHT,
Gtk.ShadowType.NONE, event.area,
child, 'toolbutton-prelight',
allocation.x, allocation.y,
allocation.width, allocation.height)
Gtk.ToggleToolButton.do_expose_event(self, event) Gtk.ToggleToolButton.do_draw(self, cr)
palette = property(get_palette, set_palette) palette = property(get_palette, set_palette)