diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-15 19:32:10 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-15 19:32:10 (GMT) |
commit | d7d1e172a3995b44350527814a7b3ac0fda3feff (patch) | |
tree | a23aa089f78cc67a79fd1bb308718fc486d3d686 /sugar | |
parent | 3bb86e0cbbbd5f93b14f0672a88a43776ec47d94 (diff) |
Let the button/theme deal with prelight. I don't think
it fits inside palette drawing.
Diffstat (limited to 'sugar')
-rw-r--r-- | sugar/graphics/palette.py | 22 | ||||
-rw-r--r-- | sugar/graphics/radiotoolbutton.py | 7 | ||||
-rw-r--r-- | sugar/graphics/toggletoolbutton.py | 7 | ||||
-rw-r--r-- | sugar/graphics/toolbutton.py | 7 |
4 files changed, 15 insertions, 28 deletions
diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py index 2d6b35b..ea298cb 100644 --- a/sugar/graphics/palette.py +++ b/sugar/graphics/palette.py @@ -577,29 +577,19 @@ class WidgetInvoker(Invoker): def draw_invoker_rect(self, event, palette): style = self._widget.style - if palette.is_up(): - gap = _calculate_gap(self.get_rect(), palette.get_rect()) - - if gap: - style.paint_box_gap(event.window, gtk.STATE_PRELIGHT, - gtk.SHADOW_IN, event.area, self._widget, - "palette-invoker", - self._widget.allocation.x, - self._widget.allocation.y, - self._widget.allocation.width, - self._widget.allocation.height, - gap[0], gap[1], gap[2]) - else: - style.paint_box(event.window, gtk.STATE_PRELIGHT, + gap = _calculate_gap(self.get_rect(), palette.get_rect()) + if gap: + style.paint_box_gap(event.window, gtk.STATE_PRELIGHT, gtk.SHADOW_IN, event.area, self._widget, "palette-invoker", self._widget.allocation.x, self._widget.allocation.y, self._widget.allocation.width, - self._widget.allocation.height) + self._widget.allocation.height, + gap[0], gap[1], gap[2]) else: style.paint_box(event.window, gtk.STATE_PRELIGHT, - gtk.SHADOW_NONE, event.area, self._widget, + gtk.SHADOW_IN, event.area, self._widget, "palette-invoker", self._widget.allocation.x, self._widget.allocation.y, diff --git a/sugar/graphics/radiotoolbutton.py b/sugar/graphics/radiotoolbutton.py index 67bb398..5ee1977 100644 --- a/sugar/graphics/radiotoolbutton.py +++ b/sugar/graphics/radiotoolbutton.py @@ -47,10 +47,9 @@ class RadioToolButton(gtk.RadioToolButton): self._palette.props.invoker = WidgetInvoker(self.child) def do_expose_event(self, event): - if self._palette and self._palette.props.draw_gap: - if self._palette.is_up() or self.child.state == gtk.STATE_PRELIGHT: - invoker = self._palette.props.invoker - invoker.draw_invoker_rect(event, self._palette) + if self._palette and self._palette.is_up(): + invoker = self._palette.props.invoker + invoker.draw_invoker_rect(event, self._palette) gtk.RadioToolButton.do_expose_event(self, event) diff --git a/sugar/graphics/toggletoolbutton.py b/sugar/graphics/toggletoolbutton.py index 196741a..1d5c740 100644 --- a/sugar/graphics/toggletoolbutton.py +++ b/sugar/graphics/toggletoolbutton.py @@ -46,10 +46,9 @@ class ToggleToolButton(gtk.ToggleToolButton): self._palette.props.invoker = WidgetInvoker(self.child) def do_expose_event(self, event): - if self._palette and self._palette.props.draw_gap: - if self._palette.is_up() or self.child.state == gtk.STATE_PRELIGHT: - invoker = self._palette.props.invoker - invoker.draw_invoker_rect(event, self._palette) + if self._palette and self._palette.is_up(): + invoker = self._palette.props.invoker + invoker.draw_invoker_rect(event, self._palette) gtk.ToggleToolButton.do_expose_event(self, event) diff --git a/sugar/graphics/toolbutton.py b/sugar/graphics/toolbutton.py index 11c803e..95e95cd 100644 --- a/sugar/graphics/toolbutton.py +++ b/sugar/graphics/toolbutton.py @@ -48,10 +48,9 @@ class ToolButton(gtk.ToolButton): self.set_palette(Palette(text)) def do_expose_event(self, event): - if self._palette and self._palette.props.draw_gap: - if self._palette.is_up() or self.child.state == gtk.STATE_PRELIGHT: - invoker = self._palette.props.invoker - invoker.draw_invoker_rect(event, self._palette) + if self._palette and self._palette.is_up(): + invoker = self._palette.props.invoker + invoker.draw_invoker_rect(event, self._palette) gtk.ToolButton.do_expose_event(self, event) |