Let the button/theme deal with prelight. I don't think

it fits inside palette drawing.
This commit is contained in:
Marco Pesenti Gritti 2007-08-15 21:32:10 +02:00
parent 3bb86e0cbb
commit d7d1e172a3
4 changed files with 15 additions and 28 deletions

View File

@ -577,9 +577,7 @@ 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,
@ -597,14 +595,6 @@ class WidgetInvoker(Invoker):
self._widget.allocation.y,
self._widget.allocation.width,
self._widget.allocation.height)
else:
style.paint_box(event.window, gtk.STATE_PRELIGHT,
gtk.SHADOW_NONE, event.area, self._widget,
"palette-invoker",
self._widget.allocation.x,
self._widget.allocation.y,
self._widget.allocation.width,
self._widget.allocation.height)
def _enter_notify_event_cb(self, widget, event):
self.emit('mouse-enter')

View File

@ -47,8 +47,7 @@ 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:
if self._palette and self._palette.is_up():
invoker = self._palette.props.invoker
invoker.draw_invoker_rect(event, self._palette)

View File

@ -46,8 +46,7 @@ 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:
if self._palette and self._palette.is_up():
invoker = self._palette.props.invoker
invoker.draw_invoker_rect(event, self._palette)

View File

@ -48,8 +48,7 @@ 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:
if self._palette and self._palette.is_up():
invoker = self._palette.props.invoker
invoker.draw_invoker_rect(event, self._palette)